diff --git a/packages/grafana-ui/src/components/OptionsUI/number.tsx b/packages/grafana-ui/src/components/OptionsUI/number.tsx
index 8c1e91c7688..4bbbf28ff8f 100644
--- a/packages/grafana-ui/src/components/OptionsUI/number.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/number.tsx
@@ -39,9 +39,10 @@ export const NumberValueEditor: React.FC<FieldConfigEditorProps<number, NumberFi
     [onChange]
   );
 
+  const defaultValue = value === undefined || value === null || isNaN(value) ? '' : value.toString();
   return (
     <Input
-      defaultValue={isNaN(value) ? '' : value.toString()}
+      defaultValue={defaultValue}
       min={settings?.min}
       max={settings?.max}
       type="number"