diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java
index 00f4015..95bfc3e 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java
@@ -40,7 +40,9 @@ public class EnvironmentHelper {
 		properties.put(BackendSettings.backendKey(BackendSettings.TYPE), "lucene");
 		properties.put(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName());
 		properties.put(BackendSettings.backendKey(LuceneBackendSettings.LUCENE_VERSION), "LUCENE_CURRENT");
-		properties.put(HibernateOrmMapperSettings.ENABLED, "true");
+
+		//Set this value to true in the properties to enable lucene.
+		properties.put(HibernateOrmMapperSettings.ENABLED, environment.getProperty("spring.jpa.properties.hibernate.search.enabled", "false"));
 
     } else {
       Arrays.asList(environment.getProperty("spring.jpa.properties", String.class).split(" ")).stream().forEach(s ->
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index f840357..63a230d 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -6,8 +6,8 @@ spring:
     password: null
     driverClassName: org.h2.Driver
     max-active: 15
-#  jpa:
-#    properties:
+  jpa:
+    properties:
 #      hibernate.dialect: org.hibernate.dialect.h2dialect
 #      hibernate.search.model_mapping: ca.uhn.fhir.jpa.search.lucenesearchmappingfactory
 #      hibernate.format_sql: false
@@ -18,6 +18,7 @@ spring:
 #      hibernate.cache.use_second_level_cache: false
 #      hibernate.cache.use_structured_entries: false
 #      hibernate.cache.use_minimal_puts: false
+#      hibernate.search.enabled: true
 #      hibernate.search.default.directory_provider: filesystem
 #      hibernate.search.default.indexbase: target/lucenefiles
 #      hibernate.search.lucene_version: lucene_current
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
index 9ac9997..52ffb6f 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
@@ -37,7 +37,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
     "spring.batch.job.enabled=false",
     "spring.datasource.url=jdbc:h2:mem:dbr5",
     "hapi.fhir.fhir_version=r5",
-    "hapi.fhir.subscription.websocket_enabled=true"
+    "hapi.fhir.subscription.websocket_enabled=true",
+	 "hapi.fhir.subscription.websocket_enabled=true"
   })
 public class ExampleServerR5IT {