diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 3b4d290aa2..c0b22df024 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -48,6 +48,7 @@
 * Bump up graphql-java to 21.5.
 * Add Unknown Node when receive Kubernetes peer address is not aware in current cluster.
 * Fix CounterWindow concurrent increase cause NPE by PriorityQueue
+* Fix format the endpoint name with empty string.
 
 #### UI
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/NamingControl.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/NamingControl.java
index 9a3bbf6784..350d668ed1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/NamingControl.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/NamingControl.java
@@ -96,7 +96,7 @@ public class NamingControl implements Service {
      * @return the string, which length less than or equals {@link #endpointNameMaxLength};
      */
     public String formatEndpointName(String serviceName, String endpointName) {
-        if (StringUtil.isEmpty(serviceName) || endpointName == null) {
+        if (StringUtil.isEmpty(serviceName) || StringUtil.isEmpty(endpointName)) {
             return endpointName;
         }