diff --git a/src/DatePicker/DatePicker.svelte b/src/DatePicker/DatePicker.svelte
index 8e7ca595..1a839844 100644
--- a/src/DatePicker/DatePicker.svelte
+++ b/src/DatePicker/DatePicker.svelte
@@ -70,7 +70,7 @@
     createEventDispatcher,
     setContext,
     afterUpdate,
-    onDestroy,
+    onMount,
   } from "svelte";
   import { writable, derived } from "svelte/store";
   import { createCalendar } from "./createCalendar";
@@ -175,6 +175,15 @@
     });
   }
 
+  onMount(() => {
+    return () => {
+      if (calendar) {
+        calendar.destroy();
+        calendar = null;
+      }
+    };
+  });
+
   afterUpdate(() => {
     if (calendar) {
       if ($range) {
@@ -188,13 +197,6 @@
     }
   });
 
-  onDestroy(() => {
-    if (calendar) {
-      calendar.destroy();
-      calendar = null;
-    }
-  });
-
   $: inputValue.set(value);
   $: value = $inputValue;
   $: inputValueFrom.set(valueFrom);