diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 545daacb2dd..9757a5f0729 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -166,10 +166,6 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
 	if(ismob(loc))
 		var/mob/m = loc
 		m.unEquip(src, 1)
-	else if(istype(loc, /obj/item/storage))
-		var/obj/item/storage/S = loc
-		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 ..()
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 45ace81c07d..ce24c76a090 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -413,7 +413,11 @@
 	if(silent)
 		prevent_warning = TRUE
 	I.forceMove(src)
+	if(QDELING(I))
+		return FALSE
 	I.on_enter_storage(src)
+	if(QDELING(I))
+		return FALSE
 
 	for(var/_M in mobs_viewing)
 		var/mob/M = _M