diff --git a/src/core/channels.c b/src/core/channels.c
index 3214a389..d1c6f66f 100644
--- a/src/core/channels.c
+++ b/src/core/channels.c
@@ -100,8 +100,7 @@ static CHANNEL_REC *channel_find_server(SERVER_REC *server,
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
 
-		if (rec->chat_type == server->chat_type &&
-		    g_strcasecmp(name, rec->name) == 0)
+		if (g_strcasecmp(name, rec->name) == 0)
 			return rec;
 	}
 
diff --git a/src/core/queries.c b/src/core/queries.c
index 9be0f156..92f791d5 100644
--- a/src/core/queries.c
+++ b/src/core/queries.c
@@ -95,8 +95,7 @@ static QUERY_REC *query_find_server(SERVER_REC *server, const char *nick)
 	for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
 		QUERY_REC *rec = tmp->data;
 
-		if (rec->chat_type == server->chat_type &&
-		    g_strcasecmp(nick, rec->name) == 0)
+		if (g_strcasecmp(nick, rec->name) == 0)
 			return rec;
 	}