diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl
index f17126607..7d1fadb68 100644
--- a/src/emqx_channel.erl
+++ b/src/emqx_channel.erl
@@ -129,6 +129,8 @@ info(topic_aliases, #channel{topic_aliases = Aliases}) ->
     Aliases;
 info(alias_maximum, #channel{alias_maximum = Limits}) ->
     Limits;
+info(will_msg, #channel{will_msg = WillMsg}) ->
+    WillMsg;
 info(gc_state, #channel{gc_state = GcState}) ->
     maybe_apply(fun emqx_gc:info/1, GcState);
 info(oom_policy, #channel{oom_policy = OomPolicy}) ->
diff --git a/test/emqx_channel_SUITE.erl b/test/emqx_channel_SUITE.erl
index e13a76686..a34cc5129 100644
--- a/test/emqx_channel_SUITE.erl
+++ b/test/emqx_channel_SUITE.erl
@@ -145,7 +145,7 @@ t_handle_disconnect(_) ->
     with_channel(
       fun(Channel) ->
               {wait_session_expire, {shutdown, normal}, Channel1} = handle_in(?DISCONNECT_PACKET(?RC_SUCCESS), Channel),
-              ?assertMatch(#{will_msg := undefined}, emqx_channel:info(protocol, Channel1))
+              ?assertEqual(undefined, emqx_channel:info(will_msg, Channel1))
       end).
 
 t_handle_auth(_) ->