diff --git a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditView.kt b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditView.kt
index f6caf2cb3..db2fee63e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditView.kt
@@ -54,7 +54,12 @@ class DateTimeEditView @JvmOverloads constructor(context: Context,
             if (entryExpiresCheckBox.isChecked)
                 setOnDateClickListener?.invoke(dateTime)
         }
-        entryExpiresCheckBox.setOnCheckedChangeListener { _, _ ->
+        entryExpiresCheckBox.setOnCheckedChangeListener { _, isChecked ->
+            mDateTime = if (isChecked) {
+                DateInstant.IN_ONE_MONTH_DATE_TIME
+            } else {
+                DateInstant.NEVER_EXPIRES
+            }
             assignExpiresDateText()
         }
     }