diff --git a/ChangeLog.txt b/ChangeLog.txt
index e64bd18c..ddba79a6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -83,6 +83,7 @@ Broker:
   username. Closes #1891.
 - Fix file logging on Windows. Closes #1880.
 - Fix bridge sock not being removed from sock hash on error. Closes #1897.
+- Default for max_queued_messages has been changed to 1000.
 
 Client library:
 - Client no longer generates random client ids for v3.1.1 clients, these are
diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml
index 503003e5..86aa656c 100644
--- a/man/mosquitto.conf.5.xml
+++ b/man/mosquitto.conf.5.xml
@@ -671,7 +671,7 @@ log_timestamp_format %Y-%m-%dT%H:%M:%S
 				<listitem>
 					<para>The maximum number of QoS 1 or 2 messages to hold in the
 						queue (per client) above those messages that are currently
-						in flight. Defaults to 100. Set to 0 for no maximum (not
+						in flight. Defaults to 1000. Set to 0 for no maximum (not
 						recommended). See also the
 						<option>queue_qos0_messages</option> and
 						<option>max_queued_bytes</option> options.</para>
diff --git a/mosquitto.conf b/mosquitto.conf
index 989efee5..adb1cac7 100644
--- a/mosquitto.conf
+++ b/mosquitto.conf
@@ -98,11 +98,11 @@
 #max_queued_bytes 0
 
 # The maximum number of QoS 1 and 2 messages to hold in a queue per client
-# above those that are currently in-flight.  Defaults to 100. Set
+# above those that are currently in-flight.  Defaults to 1000. Set
 # to 0 for no maximum (not recommended).
 # See also queue_qos0_messages.
 # See also max_queued_bytes.
-#max_queued_messages 100
+#max_queued_messages 1000
 #
 # This option sets the maximum number of heap memory bytes that the broker will
 # allocate, and hence sets a hard limit on memory use by the broker.  Memory
diff --git a/src/conf.c b/src/conf.c
index e06905bf..221a5ba2 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -609,7 +609,7 @@ int config__read(struct mosquitto__config *config, bool reload)
 	cr.log_type_set = 0;
 	cr.max_inflight_bytes = 0;
 	cr.max_queued_bytes = 0;
-	cr.max_queued_messages = 100;
+	cr.max_queued_messages = 1000;
 
 	if(!db.config_file) return 0;