diff --git a/new-lamassu-admin/src/components/layout/Header.js b/new-lamassu-admin/src/components/layout/Header.js
index 12e57ae5..0c62549a 100644
--- a/new-lamassu-admin/src/components/layout/Header.js
+++ b/new-lamassu-admin/src/components/layout/Header.js
@@ -132,7 +132,7 @@ const Header = memo(({ tree, user }) => {
                 return (
                   <NavLink
                     key={idx}
-                    to={!R.isNil(it.children) ? it.children[0].route : it.route}
+                    to={it.route || it.children[0].route}
                     isActive={match => {
                       if (!match) return false
                       setActive(it)
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
index 9b78e65d..7cec8ec7 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashCassettes.js
@@ -225,14 +225,14 @@ const CashCassettes = () => {
     {
       name: 'name',
       header: 'Machine',
-      width: widthsByNumberOfCassettes[maxNumberOfCassettes].machine,
+      width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.machine,
       view: name => <>{name}</>,
       input: ({ field: { value: name } }) => <>{name}</>
     },
     {
       name: 'cashbox',
       header: 'Cash box',
-      width: widthsByNumberOfCassettes[maxNumberOfCassettes].cashbox,
+      width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cashbox,
       view: (value, { id }) => (
         <CashIn
           currency={{ code: fiatCurrency }}
@@ -253,7 +253,7 @@ const CashCassettes = () => {
       elements.push({
         name: `cassette${it}`,
         header: `Cassette ${it}`,
-        width: widthsByNumberOfCassettes[maxNumberOfCassettes].cassette,
+        width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassette,
         stripe: true,
         doubleHeader: 'Cash-out',
         view: (value, { id }) => (
@@ -263,7 +263,7 @@ const CashCassettes = () => {
             currency={{ code: fiatCurrency }}
             notes={value}
             width={
-              widthsByNumberOfCassettes[maxNumberOfCassettes].cassetteGraph
+              widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassetteGraph
             }
             threshold={
               fillingPercentageSettings[`fillingPercentageCassette${it}`]
@@ -274,7 +274,7 @@ const CashCassettes = () => {
         input: CashCassetteInput,
         inputProps: {
           decimalPlaces: 0,
-          width: widthsByNumberOfCassettes[maxNumberOfCassettes].cassetteGraph,
+          width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.cassetteGraph,
           inputClassName: classes.cashbox
         }
       })
@@ -286,7 +286,7 @@ const CashCassettes = () => {
   elements.push({
     name: 'edit',
     header: 'Edit',
-    width: widthsByNumberOfCassettes[maxNumberOfCassettes].editWidth,
+    width: widthsByNumberOfCassettes[maxNumberOfCassettes]?.editWidth,
     textAlign: 'center',
     view: (value, { id }) => {
       return (