diff --git a/Makefile b/Makefile
index 45326a5e0..beab450a1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
 export EMQX_DASHBOARD_VERSION ?= v1.5.2
-export EMQX_EE_DASHBOARD_VERSION ?= e1.4.0-beta.1
+export EMQX_EE_DASHBOARD_VERSION ?= e1.4.0-beta.8
 
 PROFILE ?= emqx
 REL_PROFILES := emqx emqx-enterprise
diff --git a/apps/emqx_gateway_ocpp/test/emqx_ocpp_SUITE.erl b/apps/emqx_gateway_ocpp/test/emqx_ocpp_SUITE.erl
index 1add0053c..f1198fe1f 100644
--- a/apps/emqx_gateway_ocpp/test/emqx_ocpp_SUITE.erl
+++ b/apps/emqx_gateway_ocpp/test/emqx_ocpp_SUITE.erl
@@ -132,3 +132,16 @@ t_update_listeners(_Config) ->
 
     {200, [UpdatedListener]} = request(get, "/gateways/ocpp/listeners"),
     ?assertMatch(#{websocket := #{path := <<"/ocpp2">>}}, UpdatedListener).
+
+t_enable_disable_gw_ocpp(_Config) ->
+    AssertEnabled = fun(Enabled) ->
+        {200, R} = request(get, "/gateways/ocpp"),
+        E = maps:get(enable, R),
+        ?assertEqual(E, Enabled),
+        timer:sleep(500),
+        ?assertEqual(E, emqx:get_config([gateway, ocpp, enable]))
+    end,
+    ?assertEqual({204, #{}}, request(put, "/gateways/ocpp/enable/false", <<>>)),
+    AssertEnabled(false),
+    ?assertEqual({204, #{}}, request(put, "/gateways/ocpp/enable/true", <<>>)),
+    AssertEnabled(true).