diff --git a/lib/modules/messaging/index.js b/lib/modules/messaging/index.js
index eac6cc29..ba613ad1 100644
--- a/lib/modules/messaging/index.js
+++ b/lib/modules/messaging/index.js
@@ -217,7 +217,7 @@ export default class Messaging extends Base {
           data.finish();
         }
       }
-    );
+    ).remove;
   }
 
   /**
@@ -226,7 +226,7 @@ export default class Messaging extends Base {
    * @returns {*}
    */
   onTokenRefresh(listener: Function) {
-    return FirebaseMessagingEvt.addListener(EVENT_TYPE.RefreshToken, listener);
+    return FirebaseMessagingEvt.addListener(EVENT_TYPE.RefreshToken, listener).remove;
   }
 
   /**