diff --git a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
index d7a28413f..3a33a77f0 100644
--- a/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
+++ b/app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
@@ -56,7 +56,7 @@ object PushDistributorHandler : PushDistributorActions {
     }
 
     override fun getSavedDistributor(): String {
-        return unifiedPush.getDistributor(appContext)
+        return unifiedPush.getSavedDistributor(appContext) ?: ""
     }
 
     fun savedDistributorExists(): Boolean = getSavedDistributor().isNotEmpty()