diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaConformanceProviderR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaConformanceProviderR4.java
index 07851487069..b6265e91a1c 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaConformanceProviderR4.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaConformanceProviderR4.java
@@ -81,6 +81,7 @@ public class JpaConformanceProviderR4 extends org.hl7.fhir.r4.hapi.rest.server.S
 		Validate.notNull(theRestfulServer);
 		Validate.notNull(theSystemDao);
 		Validate.notNull(theDaoConfig);
+		Validate.notNull(theSearchParamRegistry);
 
 		myRestfulServer = theRestfulServer;
 		mySystemDao = theSystemDao;