diff --git a/core/app/datasource/src/main/java/io/openk9/datasource/listener/JobScheduler.java b/core/app/datasource/src/main/java/io/openk9/datasource/listener/JobScheduler.java
index fb410c2be..b65418735 100644
--- a/core/app/datasource/src/main/java/io/openk9/datasource/listener/JobScheduler.java
+++ b/core/app/datasource/src/main/java/io/openk9/datasource/listener/JobScheduler.java
@@ -538,7 +538,7 @@ private static void persistScheduler(
 					DataIndex oldDataIndex = scheduler.getOldDataIndex();
 					DataIndex newDataIndex = scheduler.getNewDataIndex();
 
-					if (oldDataIndex != null) {
+					if (oldDataIndex != null && newDataIndex != null) {
 						Set<DocType> docTypes = oldDataIndex.getDocTypes();
 						if (docTypes != null && !docTypes.isEmpty()) {
 							Set<DocType> refreshed = new LinkedHashSet<>();