diff --git a/spacestated b/spacestated
index fb2d710..7730722 100755
--- a/spacestated
+++ b/spacestated
@@ -36,10 +36,10 @@ def alarm_disarmed():
     return mqtt_get('bitlair/alarm').split(' ')[0] == 'disarmed'
 
 def getstate_djo():
-    return mqtt_get('bitlair/switch/state') == 'djo' and alarm_disarmed()
+    return mqtt_get('bitlair/switch/state/djo') == 'open' and alarm_disarmed()
 
 def getstate_bitlair():
-    return mqtt_get('bitlair/switch/state') == 'bitlair' and alarm_disarmed()
+    return mqtt_get('bitlair/switch/state/bitlair') == 'open' and alarm_disarmed()
 
 def get_state():
     return {