diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index 44928c010..4a06cafb6 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -173,7 +173,11 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
             )!!
             withContext(Dispatchers.IO) {
                 while (contributionDao.getContribution(statesToProcess)
-                        .blockingGet().size > 0
+                        .blockingGet().size > 0 && contributionDao.getContribution(
+                        arrayListOf(
+                            Contribution.STATE_IN_PROGRESS
+                        )
+                    ).blockingGet().size == 0
                 ) {
                     /*
                     queuedContributions receives the results from a one-shot query.