diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 191ef7dc9..ce166aa5a 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -953,10 +953,6 @@ server_disconnect (t_irc_server *server, int reconnect)
 {
     t_irc_channel *ptr_channel;
     
-    /* not connected/connecting to server */
-    if (!server->is_connected && (server->child_pid == 0))
-        return;
-    
     if (server->is_connected)
     {
         /* write disconnection message on each channel/private buffer */
@@ -969,11 +965,11 @@ server_disconnect (t_irc_server *server, int reconnect)
         }
     }
     
+    server_close_connection (server);
+    
     irc_display_prefix (server->buffer, PREFIX_INFO);
     gui_printf (server->buffer, _("Disconnected from server!\n"));
     
-    server_close_connection (server);
-    
     server->is_away = 0;
     server->away_time = 0;
     server->lag = 0;
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 191ef7dc9..ce166aa5a 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -953,10 +953,6 @@ server_disconnect (t_irc_server *server, int reconnect)
 {
     t_irc_channel *ptr_channel;
     
-    /* not connected/connecting to server */
-    if (!server->is_connected && (server->child_pid == 0))
-        return;
-    
     if (server->is_connected)
     {
         /* write disconnection message on each channel/private buffer */
@@ -969,11 +965,11 @@ server_disconnect (t_irc_server *server, int reconnect)
         }
     }
     
+    server_close_connection (server);
+    
     irc_display_prefix (server->buffer, PREFIX_INFO);
     gui_printf (server->buffer, _("Disconnected from server!\n"));
     
-    server_close_connection (server);
-    
     server->is_away = 0;
     server->away_time = 0;
     server->lag = 0;