diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
index d5a04bdc2e..f9fe9893ba 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
@@ -321,6 +321,7 @@ public class RuffyScripter {
             state.tbrPercent = displayedTbr.intValue();
             MenuTime durationMenuTime = ((MenuTime) currentMenu.getAttribute(MenuAttribute.RUNTIME));
             state.tbrRemainingDuration = durationMenuTime.getHour() * 60 + durationMenuTime.getMinute();
+            state.tbrRate = ((double) currentMenu.getAttribute(MenuAttribute.BASAL_RATE));
         }
         return state;
     }
diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/NoOpCommand.java b/app/src/main/java/de/jotomo/ruffyscripter/commands/NoOpCommand.java
new file mode 100644
index 0000000000..25f3e2127c
--- /dev/null
+++ b/app/src/main/java/de/jotomo/ruffyscripter/commands/NoOpCommand.java
@@ -0,0 +1,4 @@
+package de.jotomo.ruffyscripter.commands;
+
+public class NoOpCommand {
+}