diff --git a/keyserver/src/updaters/thread-updaters.js b/keyserver/src/updaters/thread-updaters.js
--- a/keyserver/src/updaters/thread-updaters.js
+++ b/keyserver/src/updaters/thread-updaters.js
@@ -637,15 +637,17 @@
         UPDATE uploads
         SET container = NULL
         WHERE container = ${request.threadID}
-          AND ${avatarUploadID} IS NOT NULL
-          AND EXISTS (
-            SELECT 1
-            FROM uploads
-            WHERE id = ${avatarUploadID}
-              AND ${avatarUploadID} IS NOT NULL
-              AND uploader = ${viewer.userID}
-              AND container IS NULL
-              AND thread IS NULL
+          AND (
+            ${avatarUploadID} IS NULL
+            OR EXISTS (
+              SELECT 1
+              FROM uploads
+              WHERE id = ${avatarUploadID}
+                AND ${avatarUploadID} IS NOT NULL
+                AND uploader = ${viewer.userID}
+                AND container IS NULL
+                AND thread IS NULL
+             )
           );
 
         UPDATE uploads