diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index 89734d06be..5e7da9bcd6 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -159,7 +159,7 @@ function Modal({
     if (subscription.current?.remove) {
       subscription.current?.remove();
     } else {
-      BackHandler.removeEventListener('hardwareBackPress', handleBack);
+      BackHandler.removeEventListener?.('hardwareBackPress', handleBack);
     }
   };
 
diff --git a/src/utils/addEventListener.tsx b/src/utils/addEventListener.tsx
index bf678ba81a..fcd96b63e7 100644
--- a/src/utils/addEventListener.tsx
+++ b/src/utils/addEventListener.tsx
@@ -21,7 +21,7 @@ export function addEventListener<
         return;
       }
 
-      Module.removeEventListener(eventName, handler);
+      Module.removeEventListener?.(eventName, handler);
       removed = true;
     },
   };
@@ -45,7 +45,7 @@ export function addListener<
         return;
       }
 
-      Module.removeEventListener(eventName, handler);
+      Module.removeEventListener?.(eventName, handler);
       removed = true;
     },
   };