diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
index cc1565af51..4fb0238ca0 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/OptionSelectDialogFragment.kt
@@ -138,7 +138,13 @@ internal class OptionSelectDialogFragment(
         SelectedOptions(
           options = currentList.filterIsInstance<OptionSelectRow.Option>().map { it.option },
           otherOptions =
-            currentList.filterIsInstance<OptionSelectRow.OtherEditText>().map { it.currentText },
+            currentList
+              .filterIsInstance<OptionSelectRow.OtherEditText>()
+              .filter {
+                it.currentText.isNotEmpty()
+              } // Filters out empty answers when the user inputs nothing into a new option choice
+              // edit text field.
+              .map { it.currentText },
         ),
       )
     }