diff --git a/pom.xml b/pom.xml
index 3bc906d..bcce503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>8.5.7-SNAPSHOT</version>
+        <version>8.5.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/common/PartitionModeConfigurer.java b/src/main/java/ca/uhn/fhir/jpa/starter/common/PartitionModeConfigurer.java
index dbf5f0f..d78b8cc 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/common/PartitionModeConfigurer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/common/PartitionModeConfigurer.java
@@ -34,7 +34,10 @@ public class PartitionModeConfigurer {
 			myPartitionSettings.setUnnamedPartitionMode(true);
 		} else if (partitioning.getRequest_tenant_partitioning_mode()) {
 			ourLog.info("Partitioning mode enabled in: Request tenant partitioning mode");
-			myRestfulServer.registerInterceptor(new RequestTenantPartitionInterceptor());
+			RequestTenantPartitionInterceptor tenantPartitionInterceptor = new RequestTenantPartitionInterceptor();
+               			tenantPartitionInterceptor.setPartitionSettings(myPartitionSettings);
+               			myRestfulServer.registerInterceptor(tenantPartitionInterceptor);
+			//myRestfulServer.registerInterceptor(new RequestTenantPartitionInterceptor());
 			myRestfulServer.setTenantIdentificationStrategy(new UrlBaseTenantIdentificationStrategy());
 		}