diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml
index b84dd855234..bf49e92d36d 100644
--- a/core-shaded/pom.xml
+++ b/core-shaded/pom.xml
@@ -88,6 +88,11 @@
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.esri.geometry</groupId>
+      <artifactId>esri-geometry-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.tinkerpop</groupId>
       <artifactId>gremlin-core</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 13dfaca11fa..dce03062123 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -90,6 +90,7 @@
     <dependency>
       <groupId>com.esri.geometry</groupId>
       <artifactId>esri-geometry-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.tinkerpop</groupId>
diff --git a/osgi-tests/pom.xml b/osgi-tests/pom.xml
index 7cf7adf20bc..281c9ff67b3 100644
--- a/osgi-tests/pom.xml
+++ b/osgi-tests/pom.xml
@@ -78,6 +78,10 @@
       <groupId>org.reactivestreams</groupId>
       <artifactId>reactive-streams</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.esri.geometry</groupId>
+      <artifactId>esri-geometry-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.tinkerpop</groupId>
       <artifactId>gremlin-core</artifactId>