diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
index c7ec35b..6ec6bc1 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
@@ -11,6 +11,7 @@ import ca.uhn.fhir.jpa.api.config.DaoConfig;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
 import ca.uhn.fhir.jpa.binary.interceptor.BinaryStorageInterceptor;
+import ca.uhn.fhir.jpa.binary.provider.BinaryAccessProvider;
 import ca.uhn.fhir.jpa.bulk.export.provider.BulkDataExportProvider;
 import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
 import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor;
@@ -86,6 +87,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
   @Autowired
   BinaryStorageInterceptor binaryStorageInterceptor;
   @Autowired
+  Optional<BinaryAccessProvider> binaryAccessProvider;
+  @Autowired
   IPackageInstallerSvc packageInstallerSvc;
   @Autowired
   AppProperties appProperties;
@@ -317,7 +320,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
     }
 
     // Binary Storage
-    if (appProperties.getBinary_storage_enabled()) {
+    if (appProperties.getBinary_storage_enabled() && binaryAccessProvider.isPresent()) {
+      registerProvider(binaryAccessProvider.get());
       getInterceptorService().registerInterceptor(binaryStorageInterceptor);
     }