diff --git a/src/protocol.cpp b/src/protocol.cpp
index 2287447b6..01c8d31c8 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -322,6 +322,9 @@ bool IRCDProto::IsChannelValid(const Anope::string &chan)
 	if (chan.empty() || chan[0] != '#' || chan.length() > Config->GetBlock("networkinfo")->Get<unsigned>("chanlen"))
 		return false;
 
+	if (chan.find_first_of(" ,") != Anope::string::npos)
+		return false;
+
 	return true;
 }