diff --git a/src/components/Dashboard/common/InputNumberCal.jsx b/src/components/Dashboard/common/InputNumberCal.jsx
index 2f2523a..e069cb6 100644
--- a/src/components/Dashboard/common/InputNumberCal.jsx
+++ b/src/components/Dashboard/common/InputNumberCal.jsx
@@ -76,7 +76,7 @@ const InputNumberCal = ({
     const next = e.target.value
     setExprValue(next)
     const num = parseFloat(next)
-    if (!next) {
+    if (next === '') {
       onChange?.(null)
     } else if (!next.match(/[+\-*/=]/) && !Number.isNaN(num)) {
       onChange?.(num)
@@ -142,11 +142,11 @@ const InputNumberCal = ({
 
   return (
     <InputNumber
-      value={value}
+      {...commonProps}
+      value={value != null ? value : null}
       onChange={onChange}
       onBlur={onBlur}
       onKeyDown={handleNumberKeyDown}
-      {...commonProps}
     />
   )
 }