diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
index f4fbece..4950393 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
@@ -47,8 +47,6 @@ public class JpaRestfulServer extends RestfulServer {
          * specified in the properties file.
          */
         FhirVersionEnum fhirVersion = HapiProperties.getFhirVersion();
-        setFhirContext(new FhirContext(fhirVersion));
-
         appCtx = new AnnotationConfigApplicationContext();
 
         /*
@@ -74,6 +72,9 @@ public class JpaRestfulServer extends RestfulServer {
         } else {
             throw new IllegalStateException();
         }
+
+        setFhirContext(appCtx.getBean(FhirContext.class));
+
         registerProviders(resourceProviders);
         registerProvider(systemProvider);