diff --git a/src/TextInput/TextInput.svelte b/src/TextInput/TextInput.svelte
index 555a9a30..86417f83 100644
--- a/src/TextInput/TextInput.svelte
+++ b/src/TextInput/TextInput.svelte
@@ -75,8 +75,8 @@
   $: isFluid = !!ctx && ctx.isFluid;
   $: errorId = `error-${id}`;
   $: warnId = `warn-${id}`;
-  $: if ($$restProps.type === "number" && value !== "") {
-    value = value === "" ? null : Number(value);
+  $: if ($$restProps.type === "number") {
+    value = value !== "" && value !== null ? Number(value) : null;
   }
 </script>