diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
index 3b4e34c2d12c15e767ad008062f400874d34ac25..3188710f54680d8e18a9f99542a19b6fa4fdeb0a 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/AttributeParsingServiceImpl.java
@@ -145,11 +145,11 @@ public class AttributeParsingServiceImpl implements IAttributeParsingService {
     }
 
     @Override
-    public void tryParseGeojson(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap) {
+    public void tryParseGeojson(String recordId, String attributeName, Object attributeVal, Map<String, Object> dataMap) {
 
         try {
             Type type = new TypeToken<Map<String, Object>>() {}.getType();
-            Map<String, Object> geoJsonMap = new Gson().fromJson(storageRecordData.get(attributeName).toString(), type);
+            Map<String, Object> geoJsonMap = new Gson().fromJson(attributeVal.toString(), type);
 
             if (geoJsonMap == null || geoJsonMap.isEmpty()) return;
 
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
index 6d7c7d261ddc049ca540a134f8ec536f68a9d47a..8d7647d31e4811d5915b0fd73ba7f8c159155aa6 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IAttributeParsingService.java
@@ -24,5 +24,5 @@ public interface IAttributeParsingService {
 
     void tryParseGeopoint(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap);
 
-    void tryParseGeojson(String recordId, String attributeName, Map<String, Object> storageRecordData, Map<String, Object> dataMap);
+    void tryParseGeojson(String recordId, String attributeName, Object attributeVal, Map<String, Object> dataMap);
 }
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index e794af5fd447bbfb04f8fd1b179959a5f0d0c328..d346d5c3653b7c7aa9fea7413d2492d944b89298 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -347,7 +347,7 @@ public class IndexerServiceImpl implements IndexerService {
                     this.attributeParsingServiceImpl.tryParseGeopoint(recordId, name, storageRecordData, dataMap);
                     break;
                 case GEO_SHAPE:
-                    this.attributeParsingServiceImpl.tryParseGeojson(recordId, name, storageRecordData, dataMap);
+                    this.attributeParsingServiceImpl.tryParseGeojson(recordId, name, value, dataMap);
                     break;
                 case NESTED:
                 case OBJECT: