diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0c797358..2660dc8b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2.0.16 - 2023-08-22
+===================
+
+Broker:
+- Fix `max_queued_message 0` stopping clients from receiving messages.
+  Closes #2879.
+
+
 2.0.16 - 2023-08-16
 ===================
 
diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c
index 8c06b942..fd716baf 100644
--- a/lib/packet_mosq.c
+++ b/lib/packet_mosq.c
@@ -154,7 +154,7 @@ int packet__queue(struct mosquitto *mosq, struct mosquitto__packet *packet)
 	pthread_mutex_lock(&mosq->out_packet_mutex);
 
 #ifdef WITH_BROKER
-	if(mosq->out_packet_count >= db.config->max_queued_messages){
+	if(db.config->max_queued_messages > 0 && mosq->out_packet_count >= db.config->max_queued_messages){
 		mosquitto__free(packet);
 		if(mosq->is_dropping == false){
 			mosq->is_dropping = true;