diff --git a/light/Light.cpp b/light/Light.cpp
index 19e578e..7c1b1e7 100644
--- a/light/Light.cpp
+++ b/light/Light.cpp
@@ -95,6 +95,11 @@ static void handleNotification(const LightState& state) {
 
     /* Disable breathing or blinking */
     set(WHITE_LED BREATH, 0);
+    set(WHITE_LED BRIGHTNESS, 0);
+
+    if (!whiteBrightness) {
+        return;
+    }
 
     switch (state.flashMode) {
         case Flash::HARDWARE: