diff --git a/android/build.gradle b/android/build.gradle
index d6019f61c..522c145df 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -60,5 +60,9 @@ dependencies {
     implementation "$appCompatLibName:$supportLibVersion"
     implementation 'com.facebook.react:react-native:+'
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
-    implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '21.1.0')}"
+    implementation ("com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '21.1.0')}") {
+        exclude group: "com.google.firebase", module: "firebase-core"
+        exclude group: "com.google.firebase", module: "firebase-analytics"
+        exclude group: "com.google.firebase", module: "firebase-measurement-connector"
+    }
 }
diff --git a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java
index ca78c0363..c9fa28528 100644
--- a/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java
+++ b/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationListenerService.java
@@ -2,10 +2,12 @@
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
+import com.google.firebase.messaging.Constants;
 
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import android.content.Intent;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -32,6 +34,14 @@ public RNPushNotificationListenerService(FirebaseMessagingService delegate) {
         this.mMessageReceivedHandler = new RNReceivedMessageHandler(delegate);
     }
 
+    @Override
+    public void handleIntent(Intent intent){
+        intent.putExtra(Constants.AnalyticsKeys.ENABLED, "0");
+        String enabled =  intent.getStringExtra(Constants.AnalyticsKeys.ENABLED);
+        Log.i(LOG_TAG, "Disabling analyticsKeys.ENABLED, new value: "+ enabled);
+        super.handleIntent(intent);
+    }
+
     @Override
     public void onNewToken(String token) {
         final String deviceToken = token;