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 0043609..6ec6bc1 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
@@ -320,7 +320,7 @@ 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);
     }