diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 4a58dc558ac54c9bd5f331b2cd5e1a5f448d77f1..cf0374075a26477e87aeb7a7d1355890e94d7661 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -694,7 +694,7 @@ class LLChatHandler : public LLCommandHandler
 		{
 		S32 channel = tokens[0].asInteger();
 			// VWR-19499 Restrict function to chat channels greater than 0.
-			if ((channel > 0) && (channel < 2147483647))
+			if ((channel > 0) && (channel < CHAT_CHANNEL_DEBUG))
 			{
 				retval = true;
 				// Say mesg on channel
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 947efdbb1964fd7253980cc979d9305b36cd6300..cf828306d87d7001b4c7345ffcc24d250fbc7047 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -895,7 +895,7 @@ class LLChatCommandHandler : public LLCommandHandler
 		{
 		S32 channel = tokens[0].asInteger();
 			// VWR-19499 Restrict function to chat channels greater than 0.
-			if ((channel > 0) && (channel < 2147483647))
+			if ((channel > 0) && (channel < CHAT_CHANNEL_DEBUG))
 			{
 				retval = true;
 		// Send unescaped message, see EXT-6353.