diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 27363e53..6e48ab52 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -236,7 +236,7 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 {
 	if (*data == '\0')
 		cmd_channel_list_joined();
-	else if (server_ischannel(server, data)) {
+	else if (server != NULL && server_ischannel(server, data)) {
 		signal_emit("command join", 3, data, server, item);
 	} else {
 		command_runsub("channel", data, server, item);