diff --git a/ChangeLog b/ChangeLog
index 2581aba67..98ed5de62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,7 @@ Version 0.4.2 (under dev!)
 * aspell: rename option aspell.look.color to aspell.color.misspelled, add option
   aspell.color.suggestions
 * aspell: add support of enchant library (patch #6858)
+* irc: fix reconnection to server using IPv6 (bug #38819, bug #40166)
 * irc: add option irc.look.notice_welcome_redirect to automatically redirect
   channel welcome notices to the channel buffer
 * irc: replace default prefix modes "qaohvu" by the standard ones "ov" when
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 5cecbbc16..9d6881a7e 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -4051,8 +4051,7 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address,
                         IRC_PLUGIN_NAME);
     }
 
-    if (reconnect)
-        server->current_retry++;
+    server->current_retry = 0;
 
     if (switch_address)
         irc_server_switch_address (server, 0);