diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java
index b0017269ff7e8..4fcacc276ac10 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMediaPlayer.java
@@ -114,7 +114,9 @@ public class KeyguardMediaPlayer {
             throw new IllegalStateException("cannot update controls, views not bound");
         }
         if (mediaMetadata == null) {
-            throw new IllegalArgumentException("media metadata was null");
+            mMediaNotifView.setVisibility(View.GONE);
+            Log.d(TAG, "media metadata was null");
+            return;
         }
         mMediaNotifView.setVisibility(View.VISIBLE);