diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index e605f0cdeb..0d8602334b 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -149,7 +149,7 @@
 			var/mob/living/M = target
 			var/obj/item/implant/tracking/I = locate() in M.implants
 			if(I)
-				RegisterSignal(I, COMSIG_IMPLANT_REMOVING, .proc/untarget_implant, I)
+				RegisterSignal(I, COMSIG_IMPLANT_REMOVING, .proc/untarget_implant)
 				imp_t = I
 			else
 				target = null
@@ -184,12 +184,13 @@
 			target_station.teleporter_console.stat &= ~NOPOWER
 			target_station.teleporter_console.update_icon()
 
-/obj/machinery/computer/teleporter/proc/untarget_implant(obj/item/implant/I) //untargets from mob the racker was once implanted in to prevent issues.
+/obj/machinery/computer/teleporter/proc/untarget_implant() //untargets from mob the racker was once implanted in to prevent issues.
 	target = null
 	if(power_station)
 		power_station.engaged = FALSE
 		power_station.teleporter_hub?.update_icon()
-	UnregisterSignal(I, COMSIG_IMPLANT_REMOVING)
+	UnregisterSignal(imp_t, COMSIG_IMPLANT_REMOVING)
+	imp_t = null
 
 /obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM)
 	var/turf/T = get_turf(AM)