diff --git a/indexer/src/main/java/au/org/aodn/esindexer/configuration/IndexerConfig.java b/indexer/src/main/java/au/org/aodn/esindexer/configuration/IndexerConfig.java
index 19c3033c..c0aea227 100644
--- a/indexer/src/main/java/au/org/aodn/esindexer/configuration/IndexerConfig.java
+++ b/indexer/src/main/java/au/org/aodn/esindexer/configuration/IndexerConfig.java
@@ -26,6 +26,7 @@ public class IndexerConfig {
     @PostConstruct
     public void init() {
         GeometryUtils.setCellSize(cellSize);
+        GeometryUtils.setExecutorService(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()));
     }
 
     @PreDestroy
diff --git a/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java
index 5d1f85d3..bb6da16d 100644
--- a/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java
+++ b/indexer/src/main/java/au/org/aodn/esindexer/utils/GeometryUtils.java
@@ -34,7 +34,8 @@ public class GeometryUtils {
     protected static Geometry landGeometry;
     // Create an ExecutorService with a fixed thread pool size
     @Getter
-    protected static ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    @Setter
+    protected static ExecutorService executorService;
 
     @Getter
     @Setter