diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index ebfac1e8..6dbd64aa 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -338,8 +338,7 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
 	char *str;
 	char *recoded;
 
-	if (!IS_IRC_SERVER(server) || server->handle == NULL ||
-	    server->handle->readbuffer == NULL)
+	if (!IS_IRC_SERVER(server) || !server->connected)
 		return;
 
 	recoded = recode_out(SERVER(server), msg, NULL);