diff --git a/lib/Backend/sensors.dart b/lib/Backend/sensors.dart
index e7e96feb..02dc550a 100644
--- a/lib/Backend/sensors.dart
+++ b/lib/Backend/sensors.dart
@@ -63,6 +63,11 @@ class Trigger extends ChangeNotifier {
   void triggerDefListener() {
     if (triggerDefinition?.enabled != _enabled && _enabled) {
       enabled = false;
+      notifyListeners();
+    }
+    if (triggerDefinition?.enabled != _enabled && !_enabled) {
+      enabled = true;
+      notifyListeners();
     }
   }
 
@@ -155,6 +160,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
     if (!value && actions.isEmpty) {
       _enabled = false;
       onDisable();
+      notifyListeners();
     } else if (requiredPermission != null && value) {
       requiredPermission?.hasAllPermissions().then((granted) {
         if (granted) {
@@ -166,8 +172,8 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
     } else if (value) {
       _enabled = true;
       onEnable();
+      notifyListeners();
     }
-    notifyListeners();
   }
 
   Ref ref;
diff --git a/lib/Frontend/pages/triggers.dart b/lib/Frontend/pages/triggers.dart
index f79c862e..2ec01eea 100644
--- a/lib/Frontend/pages/triggers.dart
+++ b/lib/Frontend/pages/triggers.dart
@@ -155,7 +155,7 @@ class _TriggersState extends ConsumerState<Triggers> {
                           setState(
                             () {
                               trigger.enabled = value;
-                              ref.watch(triggerListProvider.notifier).store();
+                              //ref.watch(triggerListProvider.notifier).store();
                             },
                           );
                         },