diff --git a/apps/emqx_gateway/src/emqx_gateway_cli.erl b/apps/emqx_gateway/src/emqx_gateway_cli.erl
index beb3e5eae..2fbc96bce 100644
--- a/apps/emqx_gateway/src/emqx_gateway_cli.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_cli.erl
@@ -39,7 +39,10 @@ unload() ->
     lists:foreach(fun(Cmd) -> emqx_ctl:unregister_command(Cmd) end, Cmds).
 
 is_cmd(Fun) ->
-    not lists:member(Fun, [init, load, module_info]).
+    case atom_to_list(Fun) of
+        "gateway" ++ _ -> true;
+        _ -> false
+    end.
 
 
 %%--------------------------------------------------------------------