diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 381e7e24a45..a7be681a22e 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -136,9 +136,9 @@
 	//I am so sorry my son
 	//We bypass helpers here cause we already have the tail
 	if(oranges_accessory.wag_flags & WAG_WAGGING) //We verified the tail exists in can_run_emote()
-		oranges_accessory.stop_wag(src)
+		oranges_accessory.stop_wag(user)
 	else
-		oranges_accessory.start_wag(src)
+		oranges_accessory.start_wag(user)
 
 /datum/emote/living/carbon/human/wag/select_message_type(mob/user, intentional)
 	. = ..()
diff --git a/code/modules/unit_tests/tail_wag.dm b/code/modules/unit_tests/tail_wag.dm
index 3868bb2c0e0..cd82dfdfd50 100644
--- a/code/modules/unit_tests/tail_wag.dm
+++ b/code/modules/unit_tests/tail_wag.dm
@@ -20,6 +20,18 @@
 	if(dummy_tail.wag_flags & WAG_WAGGING)
 		TEST_FAIL("Tail did not stop wagging when it should have!")
 
+	// TESTING WAG EMOTE
+
+	// start wagging
+	dummy.emote("wag")
+	if(!(dummy_tail.wag_flags & WAG_WAGGING))
+		TEST_FAIL("Tail did not start wagging after using the *wag emote!")
+
+	// stop wagging
+	dummy.emote("wag")
+	if(dummy_tail.wag_flags & WAG_WAGGING)
+		TEST_FAIL("Tail did not stop wagging after using the *wag emote!")
+
 	// TESTING WAG_ABLE FLAG
 
 	// flip the wag flag to unwaggable