diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 58766810..aec6aa2d 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -500,6 +500,10 @@ Channel_IsValidName( const char *Name )
 {
 	assert( Name != NULL );
 
+#ifdef STRICT_RFC
+	if (strlen(Name) <= 1)
+		return false;
+#endif
 	if (strchr("+#", Name[0]) == NULL)
 		return false;
 	if (strlen(Name) >= CHANNEL_NAME_LEN)