diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index 1505f633fcf..281a085dfe1 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -11,8 +11,13 @@
 	var/num = rand(2, 12)
 	for(var/i = 0, i < num, i++)
 		var/mob/living/simple_animal/hostile/malf_drone/D = new(get_turf(pick(possible_spawns)))
+		RegisterSignal(D, COMSIG_PARENT_QDELETING, PROC_REF(remove_drone))
 		drones_list.Add(D)
 
+/datum/event/rogue_drone/proc/remove_drone(mob/living/simple_animal/hostile/malf_drone/D)
+	SIGNAL_HANDLER
+	drones_list -= D
+
 /datum/event/rogue_drone/announce()
 	var/msg
 	if(prob(33))