diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index ec61e27595d..307234f6946 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -167,7 +167,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 		m.unEquip(src, 1)
 	else if(istype(loc, /obj/item/storage))
 		var/obj/item/storage/S = loc
-		S.remove_from_storage(src)
+		if(!QDELETED(S)) // Can happen when the storage gets deleted, thus deleting the contents
+			S.remove_from_storage(src) // Not required to call. Will only cause runtimes
 	QDEL_LIST(actions)
 	master = null
 	return ..()