diff --git a/code/datums/elements/tenacious.dm b/code/datums/elements/tenacious.dm
index 4d906812c13..35dd5774cf4 100644
--- a/code/datums/elements/tenacious.dm
+++ b/code/datums/elements/tenacious.dm
@@ -18,6 +18,9 @@
 /datum/element/tenacious/Detach(datum/target)
 	UnregisterSignal(target, COMSIG_MOB_STATCHANGE)
 	REMOVE_TRAIT(target, TRAIT_TENACIOUS, ELEMENT_TRAIT(type))
+	var/mob/living/carbon/human/valid_target = target
+	if(valid_target.remove_movespeed_modifier(/datum/movespeed_modifier/tenacious))
+		valid_target.balloon_alert(valid_target, "your tenacity wears off")
 	return ..()
 
 ///signal called by the stat of the target changing
@@ -27,6 +30,5 @@
 	if(new_stat == SOFT_CRIT)
 		target.balloon_alert(target, "your tenacity kicks in")
 		target.add_movespeed_modifier(/datum/movespeed_modifier/tenacious)
-	else
+	else if(target.remove_movespeed_modifier(/datum/movespeed_modifier/tenacious))
 		target.balloon_alert(target, "your tenacity wears off")
-		target.remove_movespeed_modifier(/datum/movespeed_modifier/tenacious)