diff --git a/rel/files/emqttd.config.production b/rel/files/emqttd.config.production
index 58d932388..837238c4f 100644
--- a/rel/files/emqttd.config.production
+++ b/rel/files/emqttd.config.production
@@ -76,7 +76,7 @@
         %% Client
         {client, [
             %% Socket is connected, but no 'CONNECT' packet received
-            {idle_timeout, 20} %% seconds
+            {idle_timeout, 30} %% seconds
         ]},
         %% Session
         {session, [
@@ -144,8 +144,8 @@
             %% Default should be scheduler numbers
             {pool_size, 8},
 
-            %% Subscription: ram | false
-            {subscription, ram},
+            %% Store Subscription: true | false
+            {subscription, true},
 
             %% Route aging time(seconds)
             {route_aging, 5}