diff --git a/src/components/CvDatePicker/CvDatePicker.vue b/src/components/CvDatePicker/CvDatePicker.vue
index 871b92f23..2bdd8512b 100644
--- a/src/components/CvDatePicker/CvDatePicker.vue
+++ b/src/components/CvDatePicker/CvDatePicker.vue
@@ -24,7 +24,7 @@
             'single',
             'range',
           ].includes(getKind),
-          [`${carbonPrefix}--date-picker--nolabel`]: getDateLabel !== undefined,
+          [`${carbonPrefix}--date-picker--nolabel`]: !getDateLabel,
         }"
       >
         <label
@@ -191,18 +191,16 @@ const getKind = computed({
   },
 });
 
-const getDateLabel = computed({
-  get() {
-    if (props.kind === 'range' && !props.dateLabel) {
+const getDateLabel = computed(() => {
+  if (props.dateLabel !== undefined) {
+    return props.dateLabel;
+  } else {
+    if (props.kind === 'range') {
       return 'Start date';
+    } else {
+      return 'Date';
     }
-
-    if (!props.dateLabel) {
-      return 'Date label';
-    }
-
-    return props.dateLabel;
-  },
+  }
 });
 
 const isRange = computed(() => {