diff --git a/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java b/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
index 1012e2ec045..68772d0e4d2 100644
--- a/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
+++ b/server/src/main/java/org/elasticsearch/index/query/VectorGeoShapeQueryProcessor.java
@@ -66,7 +66,7 @@ public class VectorGeoShapeQueryProcessor implements AbstractGeometryFieldMapper
         if (processedShape == null) {
             return new MatchNoDocsQuery();
         }
-        return queryShape.visit(new ShapeVisitor(context, fieldName, relation));
+        return processedShape.visit(new ShapeVisitor(context, fieldName, relation));
     }
 
     private class ShapeVisitor implements GeometryVisitor<Query, RuntimeException> {