diff --git a/Client/src/main/java/de/com/baseband/client/feature/Feature.java b/Client/src/main/java/de/com/baseband/client/feature/Feature.java
index ab688d7..ecfbd32 100644
--- a/Client/src/main/java/de/com/baseband/client/feature/Feature.java
+++ b/Client/src/main/java/de/com/baseband/client/feature/Feature.java
@@ -270,6 +270,10 @@ public abstract class Feature extends ToggleButton implements SetCommand {
     }
 
     public boolean setWithString(String setting, String value) {
+        if(setting.equals("Enabled") && !value.equalsIgnoreCase(String.valueOf(enabled))) {
+            toggle();
+            return true;
+        }
         return handle.setWithString(setting, value);
     }