diff --git a/core/src/main/java/com/seattlesolvers/solverslib/command/CommandOpMode.java b/core/src/main/java/com/seattlesolvers/solverslib/command/CommandOpMode.java
index a727ff363..9dbeb0c2a 100644
--- a/core/src/main/java/com/seattlesolvers/solverslib/command/CommandOpMode.java
+++ b/core/src/main/java/com/seattlesolvers/solverslib/command/CommandOpMode.java
@@ -47,9 +47,11 @@ public void runOpMode() throws InterruptedException {
             while (opModeInInit()) {
                 initialize_loop();
             }
-            preRun();
-            while (opModeIsActive()) {
-                run();
+            if (opModeIsActive()) {
+                preRun();
+                while (opModeIsActive()) {
+                    run();
+                }
             }
         } finally {
             try {