diff --git a/packages/react-components/src/InputBalance.tsx b/packages/react-components/src/InputBalance.tsx
index 4fa48e1d17..bcad35fc02 100644
--- a/packages/react-components/src/InputBalance.tsx
+++ b/packages/react-components/src/InputBalance.tsx
@@ -54,7 +54,7 @@ function reformat (value?: string | BN, isDisabled?: boolean, siDecimals?: numbe
     : formatBalance.findSi('-');
 
   return [
-    formatBalance(value, { decimals, forceUnit: si.value, withSi: false }).replace(',', isDisabled ? ',' : ''),
+    formatBalance(value, { decimals, forceUnit: si.value, withSi: false }).replace(/,/g, isDisabled ? ',' : ''),
     si
   ];
 }
diff --git a/packages/react-params/src/index.tsx b/packages/react-params/src/index.tsx
index 136d6998b9..5b803d29e2 100644
--- a/packages/react-params/src/index.tsx
+++ b/packages/react-params/src/index.tsx
@@ -97,7 +97,7 @@ class Params extends React.PureComponent<Props, State> {
                 defaultValue={values[index]}
                 index={index}
                 isDisabled={isDisabled}
-                key={`${name || ''}:${type.toString()}:${index}:${stringify(values[index])}`}
+                key={`${name || ''}:${type.toString()}:${index}:${isDisabled ? stringify(values[index]) : ''}`}
                 name={name}
                 onChange={this.onChangeParam}
                 onEnter={onEnter}