diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
index b9df338821..494cd9e1ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
@@ -120,7 +120,7 @@ public abstract class PluginBase {
                 }
             } else { // disabling plugin
                 if (state == State.ENABLED) {
-                    onStateChange(type, state, State.ENABLED);
+                    onStateChange(type, state, State.DISABLED);
                     state = State.DISABLED;
                     onStop();
                     if (L.isEnabled(L.CORE))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
index 81f301b81b..63390621ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
@@ -67,7 +67,7 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     @Override
     public void onStateChange(PluginType type, State oldState, State newState) {
         // if pump profile was enabled need to switch to another too
-        if (type == PluginType.PUMP && newState == State.ENABLED && newState == State.DISABLED && isProfileInterfaceEnabled) {
+        if (type == PluginType.PUMP && newState == State.DISABLED && isProfileInterfaceEnabled) {
             setPluginEnabled(PluginType.PROFILE, false);
             NSProfilePlugin.getPlugin().setPluginEnabled(PluginType.PROFILE, true);
             NSProfilePlugin.getPlugin().setFragmentVisible(PluginType.PROFILE, true);