diff --git a/services/java/com/android/server/TwilightService.java b/services/java/com/android/server/TwilightService.java
index 5be7205689781..a7bce54f61152 100644
--- a/services/java/com/android/server/TwilightService.java
+++ b/services/java/com/android/server/TwilightService.java
@@ -50,7 +50,7 @@ import libcore.util.Objects;
 public final class TwilightService {
     private static final String TAG = "TwilightService";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private static final String ACTION_UPDATE_TWILIGHT_STATE =
             "com.android.server.action.UPDATE_TWILIGHT_STATE";
@@ -463,6 +463,11 @@ public final class TwilightService {
         }
 
         private void updateTwilightState() {
+            if (mLocation == null) {
+                setTwilightState(null);
+                return;
+            }
+
             final long now = System.currentTimeMillis();
 
             // calculate yesterday's twilight