diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 0e42cbd39d9..811e1f44364 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -14,6 +14,7 @@
 			I.trigger(act, src)
 
 	var/message
+
 	switch(act)
 		if ("airguitar")
 			if (!src.restrained())
@@ -51,6 +52,8 @@
 			if (input2 == "Visible")
 				m_type = 1
 			else if (input2 == "Hearable")
+				if (src.miming)
+					return
 				m_type = 2
 			else
 				alert("Unable to use this emote, must be either hearable or visible.")
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 62aea265779..d49c748e880 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -5,8 +5,11 @@
 		return
 
 	log_say("[src.name]/[src.key] : [message]")
-	if (src.miming)
-		return
+
+	if (length(message) >= 1)
+		if (copytext(message, 1, 2) != "*")
+			if (src.miming)
+				return
 
 	if (src.muted)
 		return