diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
index 8e35c0cb6..559a110a5 100644
--- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
+++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
@@ -275,7 +275,10 @@ public void setObjectId(Integer objectId) throws ArcgisException {
     public JsonObject toJson() {
         JsonObject resultJSON = new JsonObject();
 
-        resultJSON.add(GEOMETRY_TAG, this.getGeometry().toJSON());
+        Geometry geo = this.getGeometry();
+        if (geo != null) {
+            resultJSON.add(GEOMETRY_TAG, geo.toJSON());
+        }
 
         JsonObject attributes = new JsonObject();
         for (Map.Entry<String, Object> attribute : this.attributes.entrySet()) {
diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
index cf7702f1e..c1b754b3a 100644
--- a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
+++ b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
@@ -719,7 +719,7 @@ public class ArcgisAggregatorDomain {
 
             LOGGER.debug("[ArcgisAggregatorDomain] - constructor init.");
             try {
-                feature = Feature.createPointFeature(0, 0);
+                feature = new Feature();
             } catch (Throwable e) {
                 LOGGER.error(
                         "ArcgisAggregatorDomain - Unexpected error " + e.getClass().getName() + " - " + e.getMessage());