diff --git a/matching-ws/src/main/java/life/catalogue/matching/IndexingService.java b/matching-ws/src/main/java/life/catalogue/matching/IndexingService.java
index 2e096c9a1..c3a4ffa3c 100644
--- a/matching-ws/src/main/java/life/catalogue/matching/IndexingService.java
+++ b/matching-ws/src/main/java/life/catalogue/matching/IndexingService.java
@@ -450,7 +450,7 @@ public static Long[] createJoinIndex(MatchingService matchingService,
 
     exec.shutdown();
     try {
-      if (!exec.awaitTermination(5, TimeUnit.MINUTES)) {
+      if (!exec.awaitTermination(30, TimeUnit.MINUTES)) {
         log.error("Forcing shut down of executor service, pending tasks will be lost! {}", exec);
         exec.shutdownNow();
       }
@@ -627,7 +627,7 @@ private void indexFile(String exportPath, String indexPath) throws Exception {
 
       exec.shutdown();
       try {
-        if (!exec.awaitTermination(5, TimeUnit.MINUTES)) {
+        if (!exec.awaitTermination(30, TimeUnit.MINUTES)) {
           log.error("Forcing shut down of executor service, pending tasks will be lost! {}", exec);
           exec.shutdownNow();
         }