diff --git a/CHANGES.md b/CHANGES.md
index 674ebf5b1ed95d3113e2a89a458c62859876e78e..a8345175d6caff0666765d97ac25df3a870e7f00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -63,6 +63,7 @@ Release Notes.
 * Add customized envoy ALS protocol receiver for satellite transmit batch data.
 * Remove `logback` dependencies in IoTDB plugin.
 * Fix `StorageModuleElasticsearchProvider` doesn't watch on `trustStorePath`.
+* Fix a wrong check about entity if GraphQL at the endpoint relation level.
 
 #### UI
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
index 8909fb017c0fa62bbeeb8a5e86129358ad26146f..b8fb5d518f84846a15726d2abc2a0bbd33e97e5b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/Entity.java
@@ -89,7 +89,7 @@ public class Entity {
                     && Objects.nonNull(serviceInstanceName) && Objects.nonNull(destServiceInstanceName)
                     && Objects.nonNull(normal) && Objects.nonNull(destNormal);
             case EndpointRelation:
-                return Objects.nonNull(serviceName) && Objects.nonNull(endpointName)
+                return Objects.nonNull(serviceName) && Objects.nonNull(destServiceName)
                     && Objects.nonNull(endpointName) && Objects.nonNull(destEndpointName)
                     && Objects.nonNull(normal) && Objects.nonNull(destNormal);
             default: