diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
index 19d325ec23..6d2a887cc5 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java
@@ -23,7 +23,7 @@ public abstract class BaseCommand implements Command {
 
     @Override
     public boolean needsRunMode() {
-        return false;
+        return true;
     }
 
     /**
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
index 8138de4b2e..c8fa185711 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
@@ -205,11 +205,6 @@ public class BolusCommand extends BaseCommand {
         bolusProgressReporter.report(STOPPING, 0, 0);
     }
 
-    @Override
-    public boolean needsRunMode() {
-        return true;
-    }
-
     @Override
     public String toString() {
         return "BolusCommand{" +
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
index 396d663ea2..4c4f9f5a02 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java
@@ -34,11 +34,6 @@ public class CancelTbrCommand extends BaseCommand {
         result = setTbrCommand.result;
     }
 
-    @Override
-    public boolean needsRunMode() {
-        return true;
-    }
-
     @Override
     public String toString() {
         return "CancelTbrCommand{}";
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
index 0a944aff1f..9798299897 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java
@@ -11,4 +11,9 @@ public class ConfirmAlertCommand extends BaseCommand {
     public void execute() {
         result.success(scripter.confirmAlert(warningCode, 5000));
     }
+
+    @Override
+    public boolean needsRunMode() {
+        return false;
+    }
 }
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
index ec4b5c58a2..5b9218dd33 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java
@@ -11,4 +11,9 @@ public class ReadPumpStateCommand extends BaseCommand {
     public String toString() {
         return "ReadPumpStateCommand{}";
     }
+
+    @Override
+    public boolean needsRunMode() {
+        return false;
+    }
 }
diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
index 0f2bdfab20..1aefd38fab 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
@@ -50,6 +50,11 @@ public class ReadReservoirLevelAndLastBolus extends BaseCommand {
         return new Date(currentYear - 1900, date.getMonth() - 1, date.getDay(), time.getHour(), time.getMinute()).getTime();
     }
 
+    @Override
+    public boolean needsRunMode() {
+        return false;
+    }
+
     @Override
     public String toString() {
         return "ReadReservoirLevelAndLastBolus{}";