diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 2de854eff88..91d5900610d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -275,14 +275,17 @@
 	if(!panel_open)
 		return
 	if(default_deconstruction_crowbar(user, I))
-		if(beaker)
-			beaker.forceMove(loc)
-			beaker = null
-		if(cell)
-			cell.forceMove(loc)
-			cell = null
 		return TRUE
 
+/obj/machinery/chem_dispenser/deconstruct(disassembled)
+	if(beaker)
+		beaker.forceMove(loc)
+		beaker = null
+	if(cell)
+		cell.forceMove(loc)
+		cell = null
+	return ..()
+
 
 /obj/machinery/chem_dispenser/multitool_act(mob/user, obj/item/I)
 	. = TRUE