diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
index 4515ec8646907..f61f31e814f70 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -409,7 +409,11 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl
         if (darkArea == null && mTintArea.isEmpty()) {
             return;
         }
-        mTintArea.set(darkArea);
+        if (darkArea == null) {
+            mTintArea.setEmpty();
+        } else {
+            mTintArea.set(darkArea);
+        }
         applyIconTint();
         mNotificationIconAreaController.setTintArea(darkArea);
     }