diff --git a/catalog/src/main/assets/date_picker_questionnaire.json b/catalog/src/main/assets/date_picker_questionnaire.json
new file mode 100644
index 0000000000..dae99f984f
--- /dev/null
+++ b/catalog/src/main/assets/date_picker_questionnaire.json
@@ -0,0 +1,10 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "When was your last menstrual period? (LMP)",
+      "type": "date"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
index 4fd0b8197d..01c1298a10 100644
--- a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
+++ b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
@@ -65,7 +65,11 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       R.string.component_name_text_field,
       "text_fields_questionnaire.json"
     ),
-    DATE_PICKER(R.drawable.ic_datepicker, R.string.component_name_date_picker, ""),
+    DATE_PICKER(
+      R.drawable.ic_datepicker,
+      R.string.component_name_date_picker,
+      "date_picker_questionnaire.json"
+    ),
     TIME_PICKER(R.drawable.ic_timepicker, R.string.component_name_time_picker, ""),
     SLIDER(R.drawable.ic_slider, R.string.component_name_slider, "slider_questionnaire.json"),
     IMAGE(R.drawable.ic_image, R.string.component_name_image, ""),