diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm
index 02cca052ea8..32f83b6af50 100644
--- a/code/game/gamemodes/changeling/powers/swap_form.dm
+++ b/code/game/gamemodes/changeling/powers/swap_form.dm
@@ -63,6 +63,8 @@
 	target.add_language("Changeling")
 	user.remove_language("Changeling")
 	user.regenerate_icons()
+	if(target.stat == DEAD && target.suiciding)  //If Target committed suicide, unset flag for User
+		target.suiciding = 0
 
 	for(var/power in lingpowers)
 		var/datum/action/changeling/S = power