diff --git a/src/Logic/ImageProviders/ImageUploadManager.ts b/src/Logic/ImageProviders/ImageUploadManager.ts
index d229998cf..e9aa4cd69 100644
--- a/src/Logic/ImageProviders/ImageUploadManager.ts
+++ b/src/Logic/ImageProviders/ImageUploadManager.ts
@@ -82,10 +82,17 @@ export class ImageUploadManager {
         this._changes = changes
         this._gps = gpsLocation
         this._reportError = reportError
-        Stores.chronic(5 * 60000).addCallback(() => {
+        Stores.chronic(5 * 60000).addCallback(async () => {
             // If images failed to upload: attempt to reupload
-            this.uploadQueue()
+            await this.uploadQueue()
         })
+
+        IsOnline.isOnline.addCallback(async (isOnline) => {
+                if (isOnline) {
+                    await this.uploadQueue()
+                }
+            },
+        )
     }
 
     public async canBeUploaded(file: File): Promise<true | { error: Translation }> {