diff --git a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
index 5e81e4008680d..4007661cf1a0d 100644
--- a/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
+++ b/services/core/java/com/android/server/wm/UnknownAppVisibilityController.java
@@ -133,7 +133,7 @@ class UnknownAppVisibilityController {
             Slog.d(TAG, "App relayouted appWindow=" + activity);
         }
         int state = mUnknownApps.get(activity);
-        if (state == UNKNOWN_STATE_WAITING_RELAYOUT) {
+        if (state == UNKNOWN_STATE_WAITING_RELAYOUT || activity.mStartingWindow != null) {
             mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE);
             mService.notifyKeyguardFlagsChanged(this::notifyVisibilitiesUpdated,
                     activity.getDisplayContent().getDisplayId());