diff --git a/src/emqx_connection.erl b/src/emqx_connection.erl
index 7fb8756a3..605e78bf7 100644
--- a/src/emqx_connection.erl
+++ b/src/emqx_connection.erl
@@ -88,10 +88,10 @@
           gc_state :: maybe(emqx_gc:gc_state()),
           %% Stats Timer
           stats_timer :: disabled | maybe(reference()),
-          %% Idle Timer
-          idle_timer :: maybe(reference()),
           %% Idle Timeout
-          idle_timeout :: integer()
+          idle_timeout :: integer(),
+          %% Idle Timer
+          idle_timer :: maybe(reference())
         }).
 
 -type(state() :: #state{}).
@@ -208,8 +208,8 @@ init_state(Transport, Socket, Options) ->
            channel      = Channel,
            gc_state     = GcState,
            stats_timer  = StatsTimer,
-           idle_timer   = IdleTimer,
-           idle_timeout = IdleTimeout
+           idle_timeout = IdleTimeout,
+           idle_timer   = IdleTimer
           }.
 
 run_loop(Parent, State = #state{transport = Transport,
diff --git a/src/emqx_ws_connection.erl b/src/emqx_ws_connection.erl
index 77c517aeb..d3eb55d2f 100644
--- a/src/emqx_ws_connection.erl
+++ b/src/emqx_ws_connection.erl
@@ -81,9 +81,7 @@
           %% Idle Timeout
           idle_timeout :: timeout(),
           %% Idle Timer
-          idle_timer :: reference(),
-          %% The Stop Reason
-          stop_reason :: term()
+          idle_timer :: reference()
         }).
 
 -type(state() :: #state{}).
@@ -131,8 +129,10 @@ info(postponed, #state{postponed = Postponed}) ->
     Postponed;
 info(stats_timer, #state{stats_timer = TRef}) ->
     TRef;
-info(stop_reason, #state{stop_reason = Reason}) ->
-    Reason.
+info(idle_timeout, #state{idle_timeout = Timeout}) ->
+    Timeout;
+info(idle_timer, #state{idle_timer = TRef}) ->
+    TRef.
 
 -spec(stats(pid()|state()) -> emqx_types:stats()).
 stats(WsPid) when is_pid(WsPid) ->
@@ -318,8 +318,8 @@ websocket_close(Reason, State) ->
     ?LOG(debug, "Websocket closed due to ~p~n", [Reason]),
     handle_info({sock_closed, Reason}, State).
 
-terminate(Error, _Req, #state{channel = Channel, stop_reason = Reason}) ->
-    ?LOG(debug, "Terminated for ~p, error: ~p", [Reason, Error]),
+terminate(Reason, _Req, #state{channel = Channel}) ->
+    ?LOG(debug, "Terminated due to ~p", [Reason]),
     emqx_channel:terminate(Reason, Channel).
 
 %%--------------------------------------------------------------------
@@ -610,8 +610,7 @@ enqueue(Other, State = #state{postponed = Postponed}) ->
     State#state{postponed = [Other|Postponed]}.
 
 shutdown(Reason, State = #state{postponed = Postponed}) ->
-    Postponed1 = [{shutdown, Reason}|Postponed],
-    return(State#state{postponed = Postponed1, stop_reason = Reason}).
+    return(State#state{postponed = [{shutdown, Reason}|Postponed]}).
 
 return(State = #state{postponed = []}) ->
     {ok, State};