diff --git a/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt b/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
index eb304bbeb3832878e5c693f99af4ec2dfe0d880a..a771405b016d370ab402cfb2b23eb54e298c7363 100644
--- a/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
+++ b/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
@@ -159,7 +159,7 @@ abstract class JamiApplication : Application() {
                 // load accounts from Daemon
                 mAccountService.loadAccountsFromDaemon(mPreferencesService.hasNetworkConnected())
                 if (mPreferencesService.settings.enablePushNotifications) {
-                    pushToken.let { token -> JamiService.setPushNotificationToken(token) }
+                    pushToken.let { token -> if (!token.isEmpty()) JamiService.setPushNotificationToken(token) }
                 } else {
                     JamiService.setPushNotificationToken("")
                 }
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
index 0de66034cdf569e29bbcb49d3677aae97cf626af..e4382d7270d41f39b5fb0a4dbbad460ea1d1428e 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
@@ -42,7 +42,7 @@ abstract class PreferencesService(
             val allowPush = settings.enablePushNotifications
             val previousSettings = userSettings
             if (previousSettings == null || previousSettings.enablePushNotifications != allowPush) {
-                mAccountService.setPushNotificationToken(if (allowPush) mDeviceService.pushToken ?: "" else "")
+                mAccountService.setPushNotificationToken(if (allowPush) mDeviceService.pushToken else "")
                 mAccountService.setProxyEnabled(allowPush)
             }
             userSettings = settings