diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl
index 2dec4d98a..1be58cdb4 100644
--- a/src/emqx_channel.erl
+++ b/src/emqx_channel.erl
@@ -786,6 +786,9 @@ handle_info(Info, Channel) ->
       -> {ok, channel()}
        | {ok, replies(), channel()}
        | {shutdown, Reason :: term(), channel()}).
+handle_timeout(_TRef, {keepalive, _StatVal},
+               Channel = #channel{keepalive = undefined}) ->
+    {ok, Channel};
 handle_timeout(_TRef, {keepalive, StatVal},
                Channel = #channel{keepalive = Keepalive}) ->
     case emqx_keepalive:check(StatVal, Keepalive) of