diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
index d30d33e..aefaaa1 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
@@ -812,8 +812,8 @@ public class AppProperties {
 		index_storage_optimized = theIndex_storage_optimized;
 	}
 
-	public Boolean getMark_resources_for_reindexing_upon_search_parameter_change() {
-		return mark_resources_for_reindexing_upon_search_parameter_change;
+	public boolean getMark_resources_for_reindexing_upon_search_parameter_change() {
+		return defaultIfNull(mark_resources_for_reindexing_upon_search_parameter_change, true);
 	}
 
 	public void setMark_resources_for_reindexing_upon_search_parameter_change(
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 5dff60e..c0dff53 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -283,6 +283,7 @@ hapi:
     # Defaults to Runtime.getRuntime().availableProcessors() if not specified
     # reindex_thread_count: 4        # Number of threads to use for reindex operations
     # expunge_thread_count: 4        # Number of threads to use for expunge operations
+    # mark_resources_for_reindexing_upon_search_parameter_change: false
 
     # -------------------------------------------------------------------------------
     # G. Narrative & Validation