diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 26c67f062d8..9801447af4e 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -311,6 +311,7 @@ datum/controller/game_controller/proc/processMobs()
 			#endif
 
 			if(PROCESS_KILL == Machinery.process())
+				Machinery.inMachineList = 0
 				Machinery.removeAtProcessing()
 				continue
 
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 416e2198824..2cd78ce5297 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -114,6 +114,8 @@ Class Procs:
 	var/panel_open = 0
 	var/area/myArea
 
+	var/inMachineList = 1
+
 /obj/machinery/New()
 	addAtProcessing()
 	return ..()