diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index d1f9c6c9..6e8851b6 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -1082,10 +1082,10 @@ Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
 
 	if (!strchr(Chan->modes, 'k'))
 		return true;
-	if (strcmp(Chan->key, Key) == 0)
-		return true;
 	if (*Key == '\0')
 		return false;
+	if (strcmp(Chan->key, Key) == 0)
+		return true;
 
 	file_name = array_start(&Chan->keyfile);
 	if (!file_name)