diff --git a/src/components/FormField/components/NumberInput/index.js b/src/components/FormField/components/NumberInput/index.js
index 316d0a5..7ec9c46 100644
--- a/src/components/FormField/components/NumberInput/index.js
+++ b/src/components/FormField/components/NumberInput/index.js
@@ -4,6 +4,7 @@ import { Controller } from 'react-hook-form';
 import { is, isEmpty } from 'ramda';
 
 import { InputNumber } from 'primereact/inputnumber';
+import { isNaN } from 'mathjs';
 
 const NumberInput = ({
                          fieldName,
@@ -29,13 +30,13 @@ const NumberInput = ({
     const input = <Controller
         name={fieldName}
         control={control}
-        defaultValue={is(Number, defaultValue) ? defaultValue : ''}
+        defaultValue={is(Number, defaultValue) || (!is(Number, defaultValue) && !isNaN(parseFloat(defaultValue))) ? defaultValue : ''}
         rules={config}
         render={({ field, fieldState }) => (
             <InputNumber inputId={field.name}
                          disabled={disabled}
                          readOnly={readOnly}
-                         value={is(Number, field.value) ? field.value : ''}
+                         value={is(Number, field.value) || (!is(Number, field.value) && !isNaN(parseFloat(field.value))) ? field.value : ''}
                          onValueChange={(e) => field.onChange(e.value)}
                          min={minAttr}
                          max={maxAttr}