diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
index 8d77c4a194a9..e9f253433740 100644
--- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
+++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
@@ -110,7 +110,9 @@ public void release(String why) {
                 } else {
                     mActiveClients.put(why, count - 1);
                 }
-                inner.release();
+                if (inner.isHeld()) {
+                    inner.release();
+                }
             }
 
             /** @see PowerManager.WakeLock#wrap(Runnable) */