diff --git a/packages/standard-components/src/forms/NumberField.svelte b/packages/standard-components/src/forms/NumberField.svelte
index db34fca60b..dcaf4e7c43 100644
--- a/packages/standard-components/src/forms/NumberField.svelte
+++ b/packages/standard-components/src/forms/NumberField.svelte
@@ -2,10 +2,17 @@
   import StringField from "./StringField.svelte"
 
   export let defaultValue
+
+  const parseNumber = val => {
+    if (val == null) {
+      return null
+    }
+    return isNaN(val) ? null : parseFloat(val)
+  }
 </script>
 
 <StringField
   {...$$props}
   type="number"
-  defaultValue={isNaN(defaultValue) ? null : parseFloat(defaultValue)}
+  defaultValue={parseNumber(defaultValue)}
 />