diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
index d95fbc304397..bcedf7038c5e 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
@@ -514,12 +514,11 @@
 
 	tracked_queen = new_queen
 
-	if(!tracked_queen.ovipositor)
+	if(!tracked_queen?.ovipositor)
 		hide_from(owner)
 
 	RegisterSignal(tracked_queen, COMSIG_QUEEN_MOUNT_OVIPOSITOR, PROC_REF(handle_mount_ovipositor))
 	RegisterSignal(tracked_queen, COMSIG_QUEEN_DISMOUNT_OVIPOSITOR, PROC_REF(handle_dismount_ovipositor))
-	RegisterSignal(tracked_queen, COMSIG_PARENT_QDELETING, PROC_REF(handle_queen_qdel))
 
 /// deals with the queen mounting the ovipositor, unhiding the action from the user
 /datum/action/xeno_action/onclick/tacmap/proc/handle_mount_ovipositor()
@@ -533,13 +532,6 @@
 
 	hide_from(owner)
 
-/// cleans up references to the queen when the queen is being qdel'd, hides the action from the user
-/datum/action/xeno_action/onclick/tacmap/proc/handle_queen_qdel()
-	SIGNAL_HANDLER
-
-	tracked_queen = null
-	hide_from(owner)
-
 /datum/action/xeno_action/onclick/tacmap/use_ability(atom/target)
 	var/mob/living/carbon/xenomorph/xeno = owner
 	xeno.xeno_tacmap()