diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java
index ebb062e0c8..015e7a1555 100644
--- a/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java
@@ -165,7 +165,7 @@ private FhirVersionEnum extractFhirVersion(final String header) {
 	public String compileAndSerializeMap(final String mapText,
 													 final FhirVersionEnum fhirVersion,
 													 final @Nullable String structureMapId) throws IOException {
-		StructureMap mapR5 = matchboxEngineSupport.getMatchboxEngine("default", null, false, false).parseMapR5(mapText);
+		StructureMap mapR5 = matchboxEngineSupport.getMatchboxEngine("default", matchboxEngineSupport.getClientContext(), true, false).parseMapR5(mapText);
 		if (structureMapId != null) {
 			mapR5.setId(structureMapId);
 		}