diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
index eeb37f4ca3..3f49256162 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt
@@ -252,7 +252,15 @@ object ResourceMapper {
 
     questionnaireItem.initialExpression
       ?.let {
-        fhirPathEngine.evaluate(launchContexts, null, null, null, it.expression).firstOrNull()
+        fhirPathEngine
+          .evaluate(
+            /* appContext= */ launchContexts,
+            /* focusResource= */ null,
+            /* rootResource= */ null,
+            /* base= */ null,
+            /* path= */ it.expression,
+          )
+          .firstOrNull()
       }
       ?.let {
         // Set initial value for the questionnaire item. Questionnaire items should not have both
diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
index 4c88f02408..cb9e0f2b2d 100644
--- a/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
+++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt
@@ -812,16 +812,6 @@ class ResourceMapperTest {
     runBlocking {
       val questionnaire =
         Questionnaire()
-          .apply {
-            addExtension().apply {
-              url = EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT
-              extension =
-                listOf(
-                  Extension("name", Coding(EXTENSION_LAUNCH_CONTEXT, "mother", "Mother")),
-                  Extension("type", CodeType("Patient")),
-                )
-            }
-          }
           .addItem(
             Questionnaire.QuestionnaireItemComponent().apply {
               linkId = "patient-dob"
@@ -839,9 +829,7 @@ class ResourceMapperTest {
             },
           )
 
-      val patientId = UUID.randomUUID().toString()
-      val patient = Patient().apply { id = "Patient/$patientId/_history/2" }
-      val questionnaireResponse = ResourceMapper.populate(questionnaire, mapOf("mother" to patient))
+      val questionnaireResponse = ResourceMapper.populate(questionnaire, emptyMap())
 
       assertThat((questionnaireResponse.item[0].answer[0].value as DateType).localDate)
         .isEqualTo((DateType(Date())).localDate)