diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.js b/new-lamassu-admin/src/pages/Cashout/Cashout.js
index 9e6df676..d07527cf 100644
--- a/new-lamassu-admin/src/pages/Cashout/Cashout.js
+++ b/new-lamassu-admin/src/pages/Cashout/Cashout.js
@@ -116,7 +116,7 @@ const CashOut = ({ name: SCREEN_KEY }) => {
         disableRowEdit={R.compose(R.not, R.path(['active']))}
         elements={getElements(machines, locale)}
       />
-      {R.isEmpty(config) && <EmptyTable message="No machines so far" />}
+      {R.isEmpty(machines) && <EmptyTable message="No machines so far" />}
       {wizard && (
         <Wizard
           machine={R.find(R.propEq('deviceId', wizard))(machines)}
diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
index e51a7d8e..e2f5fe4b 100644
--- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
+++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
@@ -43,7 +43,7 @@ const MachineStatus = () => {
   const classes = useStyles()
   const { state } = useLocation()
   const addedMachineId = state?.id
-  const { data: machinesResponse, refetch } = useQuery(GET_MACHINES)
+  const { data: machinesResponse, refetch, loading } = useQuery(GET_MACHINES)
 
   const elements = [
     {
@@ -103,6 +103,7 @@ const MachineStatus = () => {
         </div>
       </div>
       <DataTable
+        loading={loading}
         elements={elements}
         data={machines}
         Details={InnerMachineDetailsRow}