diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java
index 58b7322d0b9a1..72b3e68fa025e 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java
@@ -108,7 +108,7 @@ public GeoShapeFieldType fieldType() {
     @Override
     public void parse(ParseContext context) throws IOException {
         try {
-            Geometry shape = context.parseExternalValue(Geometry.class);
+            Object shape = context.parseExternalValue(Object.class);
             if (shape == null) {
                 ShapeBuilder shapeBuilder = ShapeParser.parse(context.parser(), this);
                 if (shapeBuilder == null) {