diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 307d3c20445..cc8b2dd5e97 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -113,6 +113,11 @@
 		A.on_body_transfer(old_current, current)
 	transfer_antag_huds(hud_to_transfer)				//inherit the antag HUD
 	transfer_actions(new_character)
+	if(martial_art)
+		if(martial_art.temporary)
+			martial_art.remove(current)
+		else
+			martial_art.teach(current)
 
 	if(active)
 		new_character.key = key		//now transfer the key to link the client to our new body
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 50ca634a22f..cc8c1e9933b 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -140,9 +140,10 @@
 		return
 	if(H.mind.martial_art != src)
 		return
-	H.mind.martial_art = base
-	if(has_explaination_verb && !(base && base.has_explaination_verb))
-		H.verbs -= /mob/living/carbon/human/proc/martial_arts_help
+	H.mind.martial_art = null // Remove reference
+	H.verbs -= /mob/living/carbon/human/proc/martial_arts_help
+	if(base)
+		base.teach(H)
 
 /mob/living/carbon/human/proc/martial_arts_help()
 	set name = "Show Info"