diff --git a/app/build.gradle b/app/build.gradle
index d6c105f2c..1fd55d4e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -115,9 +115,13 @@ dependencies {
     implementation "ch.acra:acra-dialog:5.9.6"
 
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
-    implementation 'com.github.UnifiedPush:android-connector:2.0.0'
+    implementation 'com.github.UnifiedPush:android-connector:2.0.1'
    // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'
-    playstoreImplementation 'com.github.UnifiedPush:android-embedded_fcm_distributor:1.1.0'
+    playstoreImplementation ('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
+        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'
+    }
     implementation 'com.burhanrashid52:photoeditor:1.5.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
diff --git a/app/src/playstore/AndroidManifest.xml b/app/src/playstore/AndroidManifest.xml
index 3cce1103b..27a590568 100644
--- a/app/src/playstore/AndroidManifest.xml
+++ b/app/src/playstore/AndroidManifest.xml
@@ -10,6 +10,7 @@
             android:enabled="true"
             android:exported="false">
             <intent-filter>
+                <action android:name="org.unifiedpush.android.distributor.feature.BYTES_MESSAGE"/>
                 <action android:name="org.unifiedpush.android.distributor.REGISTER" />
                 <action android:name="org.unifiedpush.android.distributor.UNREGISTER" />
             </intent-filter>
diff --git a/app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java b/app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java
index 531b915f2..e8aa8adce 100644
--- a/app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java
+++ b/app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java
@@ -1,11 +1,16 @@
 package app.fedilab.android.services;
 
 
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
 import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver;
 
 public class EmbeddedDistrib extends EmbeddedDistributorReceiver {
-    public EmbeddedDistrib() {
-        super(new HandlerFCM());
+    @Override
+    public @NotNull String getEndpoint(@Nullable Context context, @NotNull String token, @NotNull String instance) {
+        return "https://gotify.fedilab.app/FCM?token=" + token + "&instance=" + instance;
     }
-
 }
\ No newline at end of file
diff --git a/app/src/playstore/java/app/fedilab/android/services/HandlerFCM.java b/app/src/playstore/java/app/fedilab/android/services/HandlerFCM.java
deleted file mode 100644
index 7e410214f..000000000
--- a/app/src/playstore/java/app/fedilab/android/services/HandlerFCM.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package app.fedilab.android.services;
-
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import org.jetbrains.annotations.NotNull;
-import org.unifiedpush.android.embedded_fcm_distributor.GetEndpointHandler;
-
-
-public class HandlerFCM implements GetEndpointHandler {
-
-    @Override
-    public @NotNull String getEndpoint(@Nullable Context context, @NotNull String token, @NotNull String instance) {
-        return "https://gotify.fedilab.app/FCM?token=" + token + "&instance=" + instance;
-    }
-
-}
\ No newline at end of file