diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 5c7b397d2b7..8f350575c27 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -22,6 +22,10 @@
 	create_reagents(volume)
 	noz = make_noz()
 
+/obj/item/watertank/Destroy()
+	QDEL_NULL(noz)
+	return ..()
+
 /obj/item/watertank/ui_action_click()
 	toggle_mister()
 
@@ -132,6 +136,10 @@
 		loc = tank
 	return
 
+/obj/item/reagent_containers/spray/mister/Destroy()
+	tank = null
+	return ..()
+
 /obj/item/reagent_containers/spray/mister/dropped(mob/user as mob)
 	..()
 	to_chat(user, "<span class='notice'>The mister snaps back onto the watertank.</span>")