diff --git a/CHANGES.md b/CHANGES.md
index c4a354c0380315bebaa9024029293a56b6996836..85bb71d4ee3b3107a97506c80cc8e8dff66a16ac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -39,7 +39,8 @@ Release Notes.
 * Fix CVE in the uninstrumented gateways configs, when activating the dynamic configuration feature.
 * Fix CVE in the Apdex threshold configs, when activating the dynamic configuration feature.
 * Make the codes and doc consistent in sharding server and core server.
-* Fix that chunked string is incorrect while the tag contains colon
+* Fix that chunked string is incorrect while the tag contains colon.
+* Fix the incorrect dynamic configuration key bug of `endpoint-name-grouping`.
 
 #### UI
 * Fix incorrect label in radial chart in topology.
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java
index cfb307fc09072e0da56cd57bf0acdc7463758062..f9cffbf296cfc90a767e0e3ebb683dae5830e0e0 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/group/EndpointNameGroupingRuleWatcher.java
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
 import java.io.StringReader;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher;
+import org.apache.skywalking.oap.server.core.CoreModule;
 import org.apache.skywalking.oap.server.library.module.ModuleProvider;
 import org.apache.skywalking.oap.server.library.util.ResourceUtils;
 
@@ -35,7 +36,7 @@ public class EndpointNameGroupingRuleWatcher extends ConfigChangeWatcher {
 
     public EndpointNameGroupingRuleWatcher(ModuleProvider provider,
                                            EndpointNameGrouping grouping) throws FileNotFoundException {
-        super(provider.module().getName(), provider, "endpoint-name-grouping");
+        super(CoreModule.NAME, provider, "endpoint-name-grouping");
         this.grouping = grouping;
         // This is just a place holder text representing the original text.
         ruleSetting = "SkyWalking endpoint rule";