diff --git a/apps/emqx/src/emqx.erl b/apps/emqx/src/emqx.erl
index e5855b786..82688017a 100644
--- a/apps/emqx/src/emqx.erl
+++ b/apps/emqx/src/emqx.erl
@@ -257,6 +257,7 @@ emqx_feature() ->
     [ emqx_resource
     , emqx_authn
     , emqx_authz
+    , emqx_gateway
     , emqx_data_bridge
     , emqx_rule_engine
     , emqx_bridge_mqtt
diff --git a/apps/emqx_gateway/src/emqx_gateway_app.erl b/apps/emqx_gateway/src/emqx_gateway_app.erl
index 230776b73..c99228f17 100644
--- a/apps/emqx_gateway/src/emqx_gateway_app.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_app.erl
@@ -20,8 +20,6 @@
 
 -include_lib("emqx/include/logger.hrl").
 
--emqx_plugin(?MODULE).
-
 -logger_header("[Gateway]").
 
 -export([start/2, stop/1]).