diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 1054a639819..abbe2d2cf3d 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -116,7 +116,12 @@
 			m_type = 1
 
 		if("wag")
-			if(species.bodyflags & TAIL_WAGGING)
+			if(body_accessory)
+				if(body_accessory.try_restrictions(src))
+					message = "<B>[src]</B> starts wagging \his tail."
+					start_tail_wagging(1)
+
+			else if(species.bodyflags & TAIL_WAGGING)
 				if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
 					message = "<B>[src]</B> starts wagging \his tail."
 					src.start_tail_wagging(1)
@@ -126,7 +131,7 @@
 				return
 
 		if("swag")
-			if(species.bodyflags & TAIL_WAGGING)
+			if(species.bodyflags & TAIL_WAGGING || body_accessory)
 				message = "<B>[src]</B> stops wagging \his tail."
 				src.stop_tail_wagging(1)
 			else