diff --git a/serving/src/main/java/feast/serving/grpc/ServingGrpcService.java b/serving/src/main/java/feast/serving/grpc/ServingGrpcService.java
index 8773e06375..6877ae33a3 100644
--- a/serving/src/main/java/feast/serving/grpc/ServingGrpcService.java
+++ b/serving/src/main/java/feast/serving/grpc/ServingGrpcService.java
@@ -77,14 +77,6 @@ public void queryFeatures(Request request, StreamObserver<Response> responseObse
       Request validRequest = checkTimestampRange(request);
       Response response = feast.queryFeatures(validRequest);
 
-      if (response.getEntitiesCount() < 1) {
-        responseObserver.onError(
-            new StatusRuntimeException(
-                Status.fromCode(NOT_FOUND)
-                    .withDescription("No value is found for the requested feature")));
-        return;
-      }
-
       innerSpan.log("calling onNext");
       responseObserver.onNext(response);
       innerSpan.log("calling onCompleted");