diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/entity/EntityServiceEntityFetcher.java b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/entity/EntityServiceEntityFetcher.java
index 605291c9..27f2f3bd 100644
--- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/entity/EntityServiceEntityFetcher.java
+++ b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/entity/EntityServiceEntityFetcher.java
@@ -93,12 +93,18 @@ private void addSelections(
 
   private Filter.Builder buildFilter(
       ExploreRequest exploreRequest, List<String> entityIdAttributeIds, Set<String> entityIds) {
+    if (org.hypertrace.gateway.service.v1.common.Filter.getDefaultInstance()
+        .equals(exploreRequest.getFilter())) {
+      return Filter.newBuilder();
+    }
+
     Builder filterBuilder =
         Filter.newBuilder()
             .setOperator(Operator.AND)
             .addChildFilter(
                 EntityServiceAndGatewayServiceConverter.convertToEntityServiceFilter(
                     exploreRequest.getFilter()));
+
     if (entityIds.isEmpty()) {
       return filterBuilder;
     }