diff --git a/dist/main.js b/dist/main.js
index 440085e..fa56be5 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -369,12 +369,14 @@ basementSmallLight.start();
 allLabeledItems.push(basementSmallLight);
 allRelevantLights.push(basementSmallLight);
 basementSmallLight.on('somethingChanged', () => {
-    if ((basementLargeLight.getState() == 'OFF') && (basementSmallLight.getState() == 'ON')) {
+    if (basementSmallLight.getState() == 'ON') {
         setTimeout(() => {
-            MqttDispatcher_1.mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF');
+            if (basementLargeLight.getState() == 'OFF') {
+                MqttDispatcher_1.mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF');
+            }
         }, (3 * 60 * 1000));
     }
-    else if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
+    if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
         MqttDispatcher_1.mqttHandler.send(basementLargeLight.getStateTopic(), 'OFF');
     }
 });
diff --git a/src/main.ts b/src/main.ts
index 18d4b07..f969d38 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -460,11 +460,14 @@ basementSmallLight.start()
 allLabeledItems.push(basementSmallLight)
 allRelevantLights.push(basementSmallLight)
 basementSmallLight.on('somethingChanged', () => {
-  if ((basementLargeLight.getState() == 'OFF') && (basementSmallLight.getState() == 'ON')) {
+  if (basementSmallLight.getState() == 'ON') {
     setTimeout(() => {
-      mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF')
+      if (basementLargeLight.getState() == 'OFF') {
+        mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF')
+      }
     }, (3 * 60 * 1000)) 
-  } else if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
+  }
+  if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
     mqttHandler.send(basementLargeLight.getStateTopic(), 'OFF')
   }
 })