diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
index 10b5f1c64d85a..da143f9bcbe39 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java
@@ -258,7 +258,8 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage
                     Log.v(TAG, "Reloading " + pkg);
                 }
             }
-            if (Intent.ACTION_PACKAGE_REPLACED.equals(intent.getAction())) {
+            if (Intent.ACTION_PACKAGE_REPLACED.equals(intent.getAction())
+                    && componentName != null) {
                 @PluginEnabler.DisableReason int disableReason =
                         getPluginEnabler().getDisableReason(componentName);
                 if (disableReason == PluginEnabler.DISABLED_FROM_EXPLICIT_CRASH