diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java index 2f2880080e6..ccc800b3507 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -163,7 +163,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { - reactApplicationContext.addLifecycleEventListener(this); + reactApplicationContext.addLifecycleEventListenerAndCheckState(this); } } @@ -891,4 +891,12 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec } }); } + + @Override + public void onCatalystInstanceDestroy() { + ReactApplicationContext context = getReactApplicationContextIfActiveOrWarn(); + if (context != null) { + context.removeLifecycleEventListener(this); + } + } }