diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 4f72647..3f814f6 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -513,9 +513,10 @@ msg_channel(int p_or_n, const char *command,
 		if(result == CAN_SEND_OPV ||
 		   !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname))
 		{
-			if (p_or_n != NOTICE && *text == '\001')
+			if (p_or_n != NOTICE && *text == '\001' &&
+					strncasecmp(text + 1, "ACTION", 6))
 			{
-				if (strncasecmp(text + 1, "ACTION", 6) && chptr->mode.mode & MODE_NOCTCP)
+				if (chptr->mode.mode & MODE_NOCTCP)
 				{
 					sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN,
 							   form_str(ERR_CANNOTSENDTOCHAN), chptr->chname);