diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
index 7616bc985c..fedb28109f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
@@ -45,7 +45,6 @@ class PushRegistrationHandler @Inject constructor(
     @param:ManagerScope private val scope: CoroutineScope,
     @param:PushNotificationModule.PushProcessingSemaphore
     private val semaphore: Semaphore,
-    private val storage: StorageProtocol,
     private val pushRegistrationDatabase: PushRegistrationDatabase,
     private val loginStateRepository: LoginStateRepository,
 ) : OnAppStartupComponent {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
index 70910abb93..da6be333f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
@@ -24,7 +24,6 @@ import org.session.libsession.database.userAuth
 import org.session.libsession.messaging.sending_receiving.notifications.Response
 import org.session.libsession.snode.SwarmAuth
 import org.session.libsession.utilities.ConfigFactoryProtocol
-import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.exceptions.NonRetryableException
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.IdPrefix
@@ -173,6 +172,10 @@ class PushRegistrationWorker @AssistedInject constructor(
         buildRequest: (T) -> Req,
         sendBatchRequest: suspend (Collection<Req>) -> List<Res>,
     ): List<Pair<T, kotlin.Result<Unit>>> {
+        if (items.isEmpty()) {
+            return emptyList()
+        }
+
         val results = ArrayList<Pair<T, kotlin.Result<Unit>>>(items.size)
 
         val batchRequestItems = mutableListOf<T>()