diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index a3cc357307..88d67d2514 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -147,8 +147,9 @@
 		bottle = new_bottle
 
 /obj/machinery/chem_master/on_deconstruction()
-	replace_beaker(usr)
-	replace_pillbottle(usr)
+	var/atom/A = drop_location()
+	beaker.forceMove(A)
+	bottle.forceMove(A)
 	return ..()
 
 /obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \