diff --git a/nodepool/builder.py b/nodepool/builder.py
index 49cd330..054ca70 100644
--- a/nodepool/builder.py
+++ b/nodepool/builder.py
@@ -367,7 +367,9 @@ class CleanupWorker(BaseWorker):
         marked for deleting.
         '''
         cruft = self._zk.getUploads(image, build_id, provider,
-                                    states=[zk.UPLOADING, zk.DELETING])
+                                    states=[zk.UPLOADING,
+                                            zk.DELETING,
+                                            zk.FAILED])
         for upload in cruft:
             if (upload.state == zk.UPLOADING and
                 not self._inProgressUpload(upload)
@@ -385,6 +387,9 @@ class CleanupWorker(BaseWorker):
             elif upload.state == zk.DELETING:
                 self.log.info("Removing deleted upload and record: %s" % upload)
                 self._deleteUpload(upload)
+            elif upload.state == zk.FAILED:
+                self.log.info("Removing failed upload and record: %s" % upload)
+                self._deleteUpload(upload)
 
     def _cleanupImage(self, known_providers, image):
         '''