diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 80a19ab6..02337bf0 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -18,6 +18,7 @@
                 <div class="header-cell header-start">
                     <button
                         v-if="activePageIndex !== 0"
+                        type="button"
                         class="span-block-flex"
                         @click="gotoPreviousPage()">
                         <img
@@ -32,6 +33,7 @@
                 </div>
                 <div class="header-cell header-end">
                     <button
+                        type="button"
                         class="span-block-flex"
                         @click="gotoNextPage()">
                         More
@@ -297,7 +299,7 @@ export default {
     },
     unmounted() {
         if (this.mql) {
-            this.mql.removeEventListener('change', () => {});
+            this.mql.removeEventListener('change', this.handleMqlChange);
         }
     },
     methods: {
@@ -472,7 +474,7 @@ export default {
             }
             this.activePageIndex += 1;
             this.selectedDate = null;
-            this.selectedTIme = null;
+            this.selectedTime = null;
             this.selectedTimeSlot = null;
             this.findFirstAvailableDateInView();
         },