diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 66316b6f7ef..5d4ae050073 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -352,6 +352,10 @@
 		W.fire_act()
 	return 1
 
+/obj/item/storage/Exited(atom/A, loc)
+	remove_from_storage(A, loc) //worry not, comrade; this only gets called once
+	..()
+
 /obj/item/storage/empty_object_contents(burn, loc)
 	for(var/obj/item/Item in contents)
 		remove_from_storage(Item, loc, burn)