diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index aa4130ed..bbb7eb8b 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -457,8 +457,10 @@ static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
 		IRC_CHANNEL_REC *chanrec = tmp->data;
 
                 next = tmp->next;
-		if (chanrec->ownnick->host == NULL) {
-                        /* we should receive our own host for each channel */
+		if (chanrec->ownnick->host == NULL && !server->one_endofwho) {
+			/* we should receive our own host for each channel.
+			   However, some servers really are stupid enough
+			   not to reply anything to /WHO requests.. */
 			failed = TRUE;
 		} else {
 			chanrec->wholist = TRUE;