diff --git a/app/src/main/kotlin/app/dapk/st/SmallTalkApplication.kt b/app/src/main/kotlin/app/dapk/st/SmallTalkApplication.kt
index 3fb4488..d2e2f97 100644
--- a/app/src/main/kotlin/app/dapk/st/SmallTalkApplication.kt
+++ b/app/src/main/kotlin/app/dapk/st/SmallTalkApplication.kt
@@ -54,7 +54,9 @@ class SmallTalkApplication : Application(), ModuleProvider {
 
     private fun onApplicationLaunch(notificationsModule: NotificationsModule, storeModule: StoreModule) {
         applicationScope.launch {
-            featureModules.pushModule.pushTokenRegistrar().registerCurrentToken()
+            storeModule.credentialsStore().credentials()?.let {
+                featureModules.pushModule.pushTokenRegistrar().registerCurrentToken()
+            }
             storeModule.localEchoStore.preload()
         }