diff --git a/rel/files/emqttd.config b/rel/files/emqttd.config
index 442c801d7..4f08c5e9a 100644
--- a/rel/files/emqttd.config
+++ b/rel/files/emqttd.config
@@ -90,21 +90,21 @@
             %% Expired after 2 days
             {expired_after, 48},
             %% Max number of QoS 1 and 2 messages that can be “in flight” at one time.
-            {max_inflight_messages, 20},
+            {max_inflight_message, 20},
             %% Max retries for unacknolege Qos1/2 messages
             {max_unack_retries, 3},
             %% Retry after 10 seconds
             {unack_retry_after, 10}
         ]},
         {queue, [
-            %% Max messages queued when client is disconnected, or inflight messsages is overload
-            {max_queued_messages, 100},
+            %% Max messages queued when client is disconnected, or inflight messsage window is overload
+            {max_queued_messages, 200},
             %% High watermark of queued messsages
             {high_queue_watermark, 0.6},
             %% Low watermark of queued messsages
             {low_queue_watermark, 0.2},
             %% Queue Qos0 offline messages?
-            {queue_qos0_messages, false}
+            {queue_qos0_messages, true}
         ]}
     ]},
     %% Broker Options