diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 2a7e32f21..1b6d80611 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -27,6 +27,7 @@ Bug fixes::
 
   * core: replace char "," by "~" in color codes to separate foreground from background (issue #1264)
   * alias: remove default aliases /AME and /AMSG (issue #1355)
+  * irc: disable server reconnection when the server buffer is closed (issue #236)
   * irc: strip spaces at beginning/end of addresses in server option "addresses" (issue #195)
   * irc: fix display of enabled/disabled client capabilities received in command CAP ACK (issue #151)
 
diff --git a/src/plugins/irc/irc-buffer.c b/src/plugins/irc/irc-buffer.c
index a49b5b4a9..150004d9e 100644
--- a/src/plugins/irc/irc-buffer.c
+++ b/src/plugins/irc/irc-buffer.c
@@ -188,6 +188,10 @@ irc_buffer_close_cb (const void *pointer, void *data,
                     irc_server_disconnect (ptr_server, 0, 0);
                 }
 
+                /* disable reconnection */
+                ptr_server->reconnect_delay = 0;
+                ptr_server->reconnect_start = 0;
+
                 /* close server channels/privates */
                 ptr_channel = ptr_server->channels;
                 while (ptr_channel)