diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
index 552420abf8..f548771717 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
@@ -48,7 +48,8 @@ class LoggedInPresenter @Inject constructor(
             // Ensure pusher is registered
             // TODO Register with Firebase for now
             val pushProvider = pushService.getAvailablePushProviders().firstOrNull() ?: return@LaunchedEffect
-            pushService.registerWith(matrixClient, pushProvider, pushProvider.getDistributorNames().first())
+            val distributor = pushProvider.getDistributorNames().firstOrNull() ?: return@LaunchedEffect
+            pushService.registerWith(matrixClient, pushProvider, distributor)
         }
 
         val permissionsState = postNotificationPermissionsPresenter.present()