diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift
index 3ce2773a..05a5ab31 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/DatePickerEntryFieldModel.swift
@@ -98,5 +98,11 @@ open class DatePickerEntryFieldModel: FormFieldModel {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(selectedDate, forKey: .selectedDate)
         try container.encode(calendar, forKey: .calendar)
+        try container.encodeIfPresent(title, forKey: .title)
+        try container.encodeIfPresent(feedback, forKey: .feedback)
+        try container.encode(feedbackTextPlacement, forKey: .feedbackTextPlacement)
+        try container.encodeIfPresent(tooltip, forKey: .tooltip)
+        try container.encode(transparentBackground, forKey: .transparentBackground)
+        try container.encodeIfPresent(width, forKey: .width)
     }
 }