diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 1ee0a5f15c..0f98ab26cb 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -134,8 +134,10 @@
 	QDEL_NULL(ui_left)
 	QDEL_NULL(ui_right)
 	// DO NOT USE QDEL_LIST_ASSOC.
-	for(var/i in ui_item_blocks)
-		qdel(ui_item_blocks[i])		//qdel the screen object not the item
+	if(ui_item_blocks)
+		for(var/i in ui_item_blocks)
+			qdel(ui_item_blocks[i])		//qdel the screen object not the item
+		ui_item_blocks.Cut()
 	LAZYCLEARLIST(is_using)
 	return ..()