diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index f39ce07e1..76f0b552c 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -3148,7 +3148,8 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
                     }
                 }
             }
-            irc_server_set_current_server (irc_current_server);
+            if (irc_current_server)
+                irc_server_set_current_server (irc_current_server);
         }
         return WEECHAT_RC_OK;
     }