diff --git a/src/DatePickerAndroid.js b/src/DatePickerAndroid.js
index a8a1e71c..c4db8a16 100644
--- a/src/DatePickerAndroid.js
+++ b/src/DatePickerAndroid.js
@@ -46,11 +46,11 @@ export const DatePickerAndroid = React.memo((props) => {
 
   useEffect(() => {
     const eventEmitter = new NativeEventEmitter(NativeModule)
-    eventEmitter.addListener('dateChange', onChange)
-    eventEmitter.addListener('spinnerStateChange', onSpinnerStateChanged)
+    const subscriptionDateChange = eventEmitter.addListener('dateChange', onChange)
+    const subscriptionSpinnerStateChange = eventEmitter.addListener('spinnerStateChange', onSpinnerStateChanged)
     return () => {
-      eventEmitter.removeAllListeners('dateChange')
-      eventEmitter.removeAllListeners('spinnerStateChange')
+      subscriptionDateChange.remove();
+      subscriptionSpinnerStateChange.remove();
     }
   }, [onChange, onSpinnerStateChanged])