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 563e217..18c4bec 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
@@ -104,7 +104,7 @@ public class AppProperties {
 
 	private final List<String> custom_provider_classes = new ArrayList<>();
 
-	private List<Integer> search_prefetch_thresholds = List.of(13, 503, 2003, -1);
+	private List<Integer> search_prefetch_thresholds = new ArrayList<>();
 
 
 	public List<String> getCustomInterceptorClasses() {
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
index 6b9dc5f..628d9c0 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
@@ -151,7 +151,9 @@ public class FhirServerConfigCommon {
 		jpaStorageSettings.setLanguageSearchParameterEnabled(appProperties.getLanguage_search_parameter_enabled());
 
 
-		jpaStorageSettings.setSearchPreFetchThresholds(appProperties.getSearch_prefetch_thresholds());
+		if (!appProperties.getSearch_prefetch_thresholds().isEmpty()) {
+			jpaStorageSettings.setSearchPreFetchThresholds(appProperties.getSearch_prefetch_thresholds());
+		}
 
 		Integer maxFetchSize = appProperties.getMax_page_size();
 		jpaStorageSettings.setFetchSizeDefaultMaximum(maxFetchSize);