diff --git a/apps/stages/light.py b/apps/stages/light.py
index 4f4ba18..dbecd0f 100644
--- a/apps/stages/light.py
+++ b/apps/stages/light.py
@@ -12,6 +12,8 @@ from stages import Stage
 
 
 class StagedControlEvent(str, Enum):
+    """Enum to define the different types of valid stage control events"""
+
     ACTIVATE = 'activate'
     DEACTIVATE = 'deactivate'
 
@@ -24,7 +26,9 @@ class StagedLight(Hass):
 
         self.log(f'Initialized Motion Sensor with {len(self._stages)} stages')
         self.listen_event(self.handle_event, 'stage_control', app=self.name)
-        self.activate()
+
+        if self.args.get('activate-at-start', False):
+            self.activate()
 
     ### Stages