diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/NCFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/NCFirebaseMessagingService.kt
index 4e0428bce22..8f44c2142fd 100644
--- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/NCFirebaseMessagingService.kt
+++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/NCFirebaseMessagingService.kt
@@ -11,7 +11,6 @@ package com.nextcloud.talk.services.firebase
 import android.util.Log
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequest
-import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkManager
 import autodagger.AutoInjector
 import com.google.firebase.messaging.FirebaseMessagingService
@@ -22,6 +21,7 @@ import com.nextcloud.talk.jobs.NotificationWorker
 import com.nextcloud.talk.jobs.PushRegistrationWorker
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import com.nextcloud.talk.utils.preferences.AppPreferences
+import com.nextcloud.talk.utils.setExpeditedIfSupported
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
@@ -54,7 +54,7 @@ class NCFirebaseMessagingService : FirebaseMessagingService() {
                 .build()
             val notificationWork =
                 OneTimeWorkRequest.Builder(NotificationWorker::class.java).setInputData(messageData)
-                    .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                    .setExpeditedIfSupported()
                     .build()
             WorkManager.getInstance().enqueue(notificationWork)
         }