diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index a37a33a9383..2c6602c6f55 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -93,6 +93,9 @@
 
 /obj/item/storage/Destroy()
 	close_all()
+	for(var/mob/M in is_seeing)
+		if(M.s_active == src)
+			M.s_active = null
 	QDEL_NULL(boxes)
 	QDEL_NULL(storage_start)
 	QDEL_NULL(storage_continue)
@@ -313,7 +316,8 @@
 	hide_from(user)
 	user.s_active = null
 	if(!length(can_see_contents()))
-		storage_start.vis_contents = list()
+		if(storage_start)
+			storage_start.vis_contents = list()
 		QDEL_LIST(storage_screens)
 		storage_screens = list()
 
diff --git a/html/changelogs/hellfirejag-fix-storage-close-null.yml b/html/changelogs/hellfirejag-fix-storage-close-null.yml
new file mode 100644
index 00000000000..c12ad9fb3fc
--- /dev/null
+++ b/html/changelogs/hellfirejag-fix-storage-close-null.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Fixed a hard del caused by storage items (like satchels)."