diff --git a/keyserver/src/updaters/upload-updaters.js b/keyserver/src/updaters/upload-updaters.js
--- a/keyserver/src/updaters/upload-updaters.js
+++ b/keyserver/src/updaters/upload-updaters.js
@@ -15,8 +15,11 @@
   const query = SQL`
     UPDATE uploads
     SET container = ${containerID}, thread = ${threadID}
-    WHERE id IN (${mediaIDs}) AND uploader = ${viewer.id} 
-      AND container IS NULL AND thread IS NULL
+    WHERE id IN (${mediaIDs})
+      AND uploader = ${viewer.id}
+      AND container IS NULL
+      AND user_container IS NULL
+      AND thread IS NULL
   `;
   await dbQuery(query);
 }
@@ -32,8 +35,11 @@
   const query = SQL`
     UPDATE uploads
     SET container = ${containerID}, thread = ${threadID}
-    WHERE id IN (${uploadIDs}) AND uploader = ${viewer.id} 
-      AND container IS NULL AND thread IS NULL
+    WHERE id IN (${uploadIDs})
+      AND uploader = ${viewer.id}
+      AND container IS NULL
+      AND user_container IS NULL
+      AND thread IS NULL
   `;
   await dbQuery(query);
 }