diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 36a6af195..91b3f1ab3 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -999,4 +999,4 @@ listen_options() ->
      {tls_verify, false},
      {zlib, false},
      {max_stanza_size, infinity},
-     {max_fsm_queue, 5000}].
+     {max_fsm_queue, 10000}].
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 187869cfb..b1b70ccc2 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -351,4 +351,4 @@ listen_options() ->
      {tls, false},
      {tls_compression, false},
      {max_stanza_size, infinity},
-     {max_fsm_queue, 5000}].
+     {max_fsm_queue, 10000}].
diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index a5270b54d..4c0c35a3d 100644
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -302,7 +302,7 @@ listen_options() ->
      {tls, false},
      {tls_compression, false},
      {max_stanza_size, infinity},
-     {max_fsm_queue, 5000},
+     {max_fsm_queue, 10000},
      {password, undefined},
      {hosts, []},
      {check_from, true},
diff --git a/src/mod_mqtt.erl b/src/mod_mqtt.erl
index 1bc75aa15..f08fdd844 100644
--- a/src/mod_mqtt.erl
+++ b/src/mod_mqtt.erl
@@ -256,7 +256,7 @@ listen_opt_type(max_payload_size) ->
     econf:pos_int(infinity).
 
 listen_options() ->
-    [{max_fsm_queue, 5000},
+    [{max_fsm_queue, 10000},
      {max_payload_size, infinity},
      {tls, false},
      {tls_verify, false}].