diff --git a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
index bf1d1cc5cc..1ae095b6c0 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
@@ -152,11 +152,16 @@ class UnifiedPushHelper @Inject constructor(
         MaterialAlertDialogBuilder(activity)
                 .setTitle(stringProvider.getString(R.string.unifiedpush_getdistributors_dialog_title))
                 .setItems(distributorsName.toTypedArray()) { _, which ->
+                    val distributor = distributors[which]
+                    if (distributor == getCurrentDistributorName()) {
+                        Timber.d("Same distributor selected again, no action")
+                        return@setItems
+                    }
+
                     if (unregisterFirst) {
                         // Un-register first
                         unregister(pushersManager)
                     }
-                    val distributor = distributors[which]
                     up.saveDistributor(context, distributor)
                     Timber.i("Saving distributor: $distributor")
                     up.registerApp(context)