diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt
index 087f3e6..269f129 100644
--- a/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt
+++ b/Nabi/presentation/src/main/java/com/nabi/nabi/fcm/MyFirebaseMessagingService.kt
@@ -117,14 +117,10 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
         }
     }
 
-    fun getRegistrationToken(): String? = runBlocking {
-        return@runBlocking try {
-            FirebaseMessaging.getInstance().token.await()
+    fun getRegistrationToken(): String? = try {
+            FirebaseMessaging.getInstance().token.result
         } catch (e: Exception) {
             LoggerUtils.w("Fetching FCM Registration Token failed")
             null
         }
-    }
-
-
 }
\ No newline at end of file