diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java index f394b073c1a..e84a620d582 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java @@ -805,7 +805,13 @@ public class SurfaceMountingManager { viewState = new ViewState(reactTag, null, null); mTagToViewState.put(reactTag, viewState); } + EventEmitterWrapper previousEventEmitterWrapper = viewState.mEventEmitter; viewState.mEventEmitter = eventEmitter; + + // Immediately destroy native side of wrapper, instead of waiting for Java GC. + if (previousEventEmitterWrapper != eventEmitter && previousEventEmitterWrapper != null) { + previousEventEmitterWrapper.destroy(); + } } @UiThread