diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java index 09d20d6c9a3d8c..a4cdda0b7180c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java @@ -44,5 +44,6 @@ public void notifyJSInstanceDestroy() { JSIModuleHolder moduleHolder = entry.getValue(); moduleHolder.notifyJSInstanceDestroy(); } + mModules.clear(); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java index e45069d75adb53..9400f8e920686a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java @@ -84,6 +84,7 @@ private ReactApplicationContext getReactApplicationContext() { for (ModuleHolder module : mModules.values()) { module.destroy(); } + mModules.clear(); } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); }