diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 4bdce05fb..820958bd2 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -8,6 +8,14 @@
 :see-release-notes: If you are upgrading: please see release notes.
 :breaking: pass:quotes[*[breaking]*]
 
+[[v4.3.7]]
+== Version 4.3.7 (under dev)
+
+[[v4.3.7_fixed]]
+=== Fixed
+
+* irc: fix send of split messages when server option "anti_flood" set to 0 (issue #2172)
+
 [[v4.3.6]]
 == Version 4.3.6 (2024-08-15)
 
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index dfab7a93d..aae30ab8e 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -2988,8 +2988,14 @@ irc_server_outqueue_send (struct t_irc_server *server)
         if (!server->outqueue[priority])
             continue;
 
-        irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
-        irc_server_outqueue_free (server, priority, server->outqueue[priority]);
+        /* send all messages with anti_flood == 0, or just one */
+        while (server->outqueue[priority])
+        {
+            irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
+            irc_server_outqueue_free (server, priority, server->outqueue[priority]);
+            if (anti_flood > 0)
+                break;
+        }
 
         /*
          * continue to send for immediate priority (= 0),