diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuantityViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuantityViewHolderFactory.kt
index fa762fc6c5..a7840fd873 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuantityViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/QuantityViewHolderFactory.kt
@@ -192,8 +192,8 @@ internal object QuantityViewHolderFactory :
           }
             ?: questionnaireViewItem.draftAnswer?.let { if (it is Coding) it else null }
               ?: questionnaireViewItem.questionnaireItem
-              .takeIf { it.hasInitial() }
-              ?.initialFirstRep
+              .initial
+              ?.firstOrNull()
               ?.valueQuantity
               ?.toCoding()
         unitAutoCompleteTextView.setText(unit?.display ?: "")