diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
index 2431f20c..ec0b3c35 100644
--- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
+++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
@@ -60,6 +60,11 @@ const CommissionsList = memo(
       getCommissions(cryptoCode, deviceId, config)
     )(machinesCoinsTuples)
 
+    const tableData = R.compose(
+      sortCommissionsBy(orderProp, machines),
+      filterCommissions(coinFilter, machineFilter, machines)
+    )(commissions)
+
     return (
       <div>
         <div className={classes.headerLine}>
@@ -93,10 +98,7 @@ const CommissionsList = memo(
             save={saveOverrides}
             initialValues={overridesDefaults}
             validationSchema={getListCommissionsSchema()}
-            data={R.compose(
-              sortCommissionsBy(orderProp, machines),
-              filterCommissions(coinFilter, machineFilter, machines)
-            )(commissions)}
+            data={tableData}
             elements={commissionsList(data, currency)}
           />
         </div>
diff --git a/new-lamassu-admin/src/pages/Commissions/helper.js b/new-lamassu-admin/src/pages/Commissions/helper.js
index cdf11b9d..bdb11d2e 100644
--- a/new-lamassu-admin/src/pages/Commissions/helper.js
+++ b/new-lamassu-admin/src/pages/Commissions/helper.js
@@ -410,7 +410,7 @@ const getMachineCoins = (deviceId, localeConfig) => {
 
   const overrides = R.prop('overrides', localeConfig)
 
-  if (!R.isEmpty(overrides)) {
+  if (overrides && !R.isEmpty(overrides)) {
     const override = R.find(it => it.machine === deviceId)(overrides)
 
     if (override !== undefined) return R.prop('cryptoCurrencies', override)
@@ -473,11 +473,7 @@ const getListCommissionsFields = (getData, currency, defaults) => {
       size: 'sm',
       view: getView(machineData, 'name', 'deviceId'),
       input: TextInput,
-      editable: false,
-      inputProps: {
-        valueProp: 'deviceId',
-        getLabel: R.path(['name'])
-      }
+      editable: false
     },
     {
       name: 'cryptoCurrencies',
@@ -485,7 +481,6 @@ const getListCommissionsFields = (getData, currency, defaults) => {
       width: 280,
       view: R.prop(0),
       size: 'sm',
-      input: TextInput,
       editable: false
     },
     {