diff --git a/src/controller/controller_storage.cpp b/src/controller/controller_storage.cpp
index 7e201441..23eefc5d 100644
--- a/src/controller/controller_storage.cpp
+++ b/src/controller/controller_storage.cpp
@@ -423,9 +423,11 @@ namespace Controller{
 
     static bool serverStartTriggered;
     if (!serverStartTriggered){
-      if (!Triggers::doTrigger("SYSTEM_START")){
-        INFO_MSG("Shutting down because of SYSTEM_START trigger response");
-        conf.is_active = false;
+      if (Triggers::shouldTrigger("SYSTEM_START")){
+        if (!Triggers::doTrigger("SYSTEM_START")){
+          INFO_MSG("Shutting down because of SYSTEM_START trigger response");
+          conf.is_active = false;
+        }
       }
       serverStartTriggered = true;
     }