diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
index a14b672e9..0263c6fe4 100644
--- a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
+++ b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
@@ -56,9 +56,10 @@ class PushMessageReceiver : MessagingReceiver() {
 
     override fun onNewEndpoint(context: Context, endpoint: String, instance: String) {
         Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
-        pushHandler.setEndpoint(endpoint)
+        val sanitizedEndpoint = endpoint.dropLast(5)
+        pushHandler.setEndpoint(sanitizedEndpoint)
         scope.launch(Dispatchers.IO) {
-            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(endpoint)
+            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
             notificationManager().getOrCreateZapChannel(appContext)
             notificationManager().getOrCreateDMChannel(appContext)
         }