diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index e65a01cd25e158..3aa8c930349271 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -143,9 +143,12 @@ public void stopSurface(final int surfaceId) { surfaceMountingManager.stopSurface(); - if (surfaceMountingManager == mMostRecentSurfaceMountingManager) { + if (mMostRecentSurfaceMountingManager == surfaceMountingManager) { mMostRecentSurfaceMountingManager = null; } + if (mLastQueriedSurfaceMountingManager == surfaceMountingManager) { + mLastQueriedSurfaceMountingManager = null; + } } else { ReactSoftExceptionLogger.logSoftException( TAG,