diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/ExploreService.java b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/ExploreService.java
index 91fba039..7b4f5088 100644
--- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/ExploreService.java
+++ b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/explore/ExploreService.java
@@ -146,9 +146,7 @@ private IRequestHandler getRequestHandler(
       ExploreRequest request,
       Map<String, AttributeMetadata> attributeMetadataMap,
       RequestContext requestContext) {
-    if (isContextAnEntityType(request, requestContext)
-        && !hasTimeAggregations(request)
-        && !request.getGroupByList().isEmpty()) {
+    if (isContextAnEntityType(request, requestContext) && !hasTimeAggregations(request)) {
       ExpressionContext expressionContext =
           new ExpressionContext(
               gatewayServiceConfig,