diff --git a/app/build.gradle b/app/build.gradle
index fcdde6dea4..21e2521ece 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -263,7 +263,7 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.5.3'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.7.1"
-    playImplementation ("com.google.firebase:firebase-messaging:18.0.0") {
+    playImplementation ("com.google.firebase:firebase-messaging:24.0.0") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -393,7 +393,6 @@ dependencies {
     implementation "androidx.camera:camera-lifecycle:1.3.2"
     implementation "androidx.camera:camera-view:1.3.2"
 
-    implementation 'com.google.firebase:firebase-core:21.1.1'
     implementation "com.google.mlkit:barcode-scanning:17.2.0"
 }
 
diff --git a/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt b/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt
index d40f160d0b..22c258ddcf 100644
--- a/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt
+++ b/app/src/play/kotlin/org/thoughtcrime/securesms/notifications/FirebaseTokenFetcher.kt
@@ -1,19 +1,19 @@
 package org.thoughtcrime.securesms.notifications
 
-import com.google.android.gms.tasks.Tasks
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
+import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class FirebaseTokenFetcher @Inject constructor(): TokenFetcher {
+    val TAG = "FirebaseTF"
+
     override suspend fun fetch() = withContext(Dispatchers.IO) {
-        FirebaseInstanceId.getInstance().instanceId
-            .also(Tasks::await)
-            .takeIf { isActive } // don't 'complete' task if we were canceled
-            ?.run { result?.token ?: throw exception!! }
+        FirebaseMessaging.getInstance().token.await().takeIf { isActive } ?: throw Exception("Firebase token is null")
     }
-}
+}
\ No newline at end of file