diff --git a/terminal/master/src/main.cpp b/terminal/master/src/main.cpp
index a124577..20a79d7 100644
--- a/terminal/master/src/main.cpp
+++ b/terminal/master/src/main.cpp
@@ -111,19 +111,20 @@ bool checkPowerState()
       rawState != powerStableState)
   {
     powerStableState = rawState;
-    digitalWrite(PIN_POWER_SWITCH_OUTPUT, powerStableState == HIGH);
-    if (powerStableState == HIGH)
+    if (powerStableState)
     {
       setDrawerLight(selectedIndex);
+      digitalWrite(PIN_POWER_SWITCH_OUTPUT, HIGH);
       enableEncoder();
     }
     else
     {
       turnLightsOff();
+      digitalWrite(PIN_POWER_SWITCH_OUTPUT, LOW);
       disableEncoder();
     }
   }
-  return (powerStableState == HIGH);
+  return powerStableState;
 }
 
 /* ========================================================= */