diff --git a/data/model/storage.py b/data/model/storage.py
index 41c5583b0..0f2220f91 100644
--- a/data/model/storage.py
+++ b/data/model/storage.py
@@ -75,6 +75,12 @@ def garbage_collect_storage(storage_id_whitelist):
                           .execute())
       logger.debug('Removed %s torrent info records', torrents_removed)
 
+      signatures_removed = (ImageStorageSignature
+                            .delete()
+                            .where(ImageStorageSignature.storage << orphaned_storages)
+                            .execute())
+      logger.debug('Removed %s image storage signatures', signatures_removed)
+
       storages_removed = (ImageStorage
                           .delete()
                           .where(ImageStorage.id << orphaned_storages)