diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgError.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgError.java
index 020256d1c7..c416a8baad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgError.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgError.java
@@ -31,10 +31,6 @@ public class MsgError extends MessageBase {
                 break;
             case 5: // Occlusion
                 errorString = MainApp.sResources.getString(R.string.occlusion);
-                EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
-                MsgBolusStop.stopped = true;
-                bolusingEvent.status = errorString;
-                MainApp.bus().post(bolusingEvent);
                 break;
             case 7: // Low Battery
                 errorString = MainApp.sResources.getString(R.string.lowbattery);
@@ -43,6 +39,13 @@ public class MsgError extends MessageBase {
                 errorString = MainApp.sResources.getString(R.string.batterydischarged);
                 break;
         }
+
+        if (errorCode < 8) { // bolus delivering stopped
+            EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
+            MsgBolusStop.stopped = true;
+            bolusingEvent.status = errorString;
+            MainApp.bus().post(bolusingEvent);
+        }
         if (Config.logDanaMessageDetail)
             log.debug("Error detected: " + errorString);
         MainApp.getConfigBuilder().uploadError(errorString);