diff --git a/domains/android/push/src/main/kotlin/app/dapk/st/push/PushTokenRegistrars.kt b/domains/android/push/src/main/kotlin/app/dapk/st/push/PushTokenRegistrars.kt
index 44a9679..eb29104 100644
--- a/domains/android/push/src/main/kotlin/app/dapk/st/push/PushTokenRegistrars.kt
+++ b/domains/android/push/src/main/kotlin/app/dapk/st/push/PushTokenRegistrars.kt
@@ -55,7 +55,7 @@ class PushTokenRegistrars(
     }
 
     override suspend fun registerCurrentToken() {
-        when (selection) {
+        when (currentSelection()) {
             FIREBASE_OPTION -> messagingPushTokenRegistrar.registerCurrentToken()
             NONE -> {
                 // do nothing
@@ -75,6 +75,10 @@ class PushTokenRegistrars(
                 }
             }
 
+            null -> {
+                // do nothing
+            }
+
             else -> unifiedPushRegistrar.unregister()
         }
     }