diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index c4e69755afeac..308d753cea666 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -416,6 +416,9 @@ public class DozeTriggers implements DozeMachine.Part {
                 mDockManager.removeListener(mDockEventListener);
                 mDozeSensors.setListening(false);
                 mDozeSensors.setProxListening(false);
+                mWantSensors = false;
+                mWantProx = false;
+                mWantTouchScreenSensors = false;
                 break;
             default:
         }
@@ -431,7 +434,7 @@ public class DozeTriggers implements DozeMachine.Part {
             mDozeSensors.setTouchscreenSensorsListening(mWantTouchScreenSensors);
         } else {
             mDozeSensors.setProxListening(false);
-            mDozeSensors.setListening(false);
+            mDozeSensors.setListening(mWantSensors);
         }
     }