diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index 8bbb66a5b..5321e5613 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -157,9 +157,9 @@ export default {
 	data() {
 		return {
 			// input type following DatePicker docs
-			inputType: this.property.getDefaultType() === 'date-time' || this.property.getDefaultType() === 'date-and-or-time'
+			inputType: this.property.type === 'date-time' || this.property.type === 'date-and-or-time'
 				? 'datetime'
-				: this.property.getDefaultType() === 'date'
+				: this.property.type === 'date'
 					? 'date'
 					: 'time',
 
diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js
index 3a21b2501..0258d9b1a 100644
--- a/src/models/rfcProps.js
+++ b/src/models/rfcProps.js
@@ -105,6 +105,7 @@ const properties = {
 	deathdate: {
 		readableName: t('contacts', 'Date of death'),
 		icon: 'icon-calendar-dark',
+		force: 'date',
 		defaultValue: {
 			value: new VCardTime().fromJSDate(new Date())
 		}