diff --git a/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte b/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte
index 6f1490a573..14f3559e9a 100644
--- a/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker/TimePicker.svelte
@@ -9,6 +9,11 @@
   $: displayValue = value?.format("HH:mm")
 
   const handleChange = e => {
+    if (!e.target.value) {
+      dispatch("change", undefined)
+      return
+    }
+
     const [hour, minute] = e.target.value.split(":").map(x => parseInt(x))
     dispatch("change", value.hour(hour).minute(minute))
   }