diff --git a/packages/client/src/utils/enrichDataBinding.js b/packages/client/src/utils/enrichDataBinding.js
index 3b16f70fc9..93d51daf10 100644
--- a/packages/client/src/utils/enrichDataBinding.js
+++ b/packages/client/src/utils/enrichDataBinding.js
@@ -8,6 +8,9 @@ const entityMap = {
   ">": ">",
 }
 mustache.escape = text => {
+  if (text == null || typeof text !== "string") {
+    return text
+  }
   return text.replace(/[<>]/g, function fromEntityMap(s) {
     return entityMap[s] || s
   })
diff --git a/packages/standard-components/src/DatePicker.svelte b/packages/standard-components/src/DatePicker.svelte
index 5f1c70f63c..77b98b670b 100644
--- a/packages/standard-components/src/DatePicker.svelte
+++ b/packages/standard-components/src/DatePicker.svelte
@@ -2,11 +2,13 @@
   import { DatePicker } from "@budibase/bbui"
   import { getContext } from "svelte"
 
-  const { styleable } = getContext("sdk")
+  const { styleable, setBindableValue } = getContext("sdk")
   const component = getContext("component")
 
   export let placeholder
-  export let value
+
+  let value
+  $: setBindableValue(value, $component.id)
 
   function handleChange(event) {
     const [fullDate] = event.detail