diff --git a/data/model/legacy.py b/data/model/legacy.py
index cc32b8979..52723bd11 100644
--- a/data/model/legacy.py
+++ b/data/model/legacy.py
@@ -1037,7 +1037,8 @@ def find_create_or_link_image(docker_image_id, repository, username, translation
       .join(Repository)
       .join(Visibility)
       .switch(Repository)
-      .join(RepositoryPermission, JOIN_LEFT_OUTER))
+      .join(RepositoryPermission, JOIN_LEFT_OUTER)
+      .where(ImageStorage.uploading == False))
 
     query = (_filter_to_repos_for_user(query, username)
       .where(Image.docker_image_id == docker_image_id))