diff --git a/new-lamassu-admin/src/pages/MachineLogs.js b/new-lamassu-admin/src/pages/MachineLogs.js
index 91b3119c..59dbdee0 100644
--- a/new-lamassu-admin/src/pages/MachineLogs.js
+++ b/new-lamassu-admin/src/pages/MachineLogs.js
@@ -135,7 +135,7 @@ const Logs = () => {
             </TableBody>
           </Table>
           {loading && <H4>{'Loading...'}</H4>}
-          {!loading && !R.isEmpty(logsResponse) && (
+          {!loading && R.isEmpty(logsResponse?.machineLogs) && (
             <H4>{'No activity so far'}</H4>
           )}
         </div>
diff --git a/new-lamassu-admin/src/pages/ServerLogs.js b/new-lamassu-admin/src/pages/ServerLogs.js
index f37124cd..8bedb3ad 100644
--- a/new-lamassu-admin/src/pages/ServerLogs.js
+++ b/new-lamassu-admin/src/pages/ServerLogs.js
@@ -189,7 +189,9 @@ const Logs = () => {
             </TableBody>
           </Table>
           {loading && <H4>{'Loading...'}</H4>}
-          {!loading && !R.isEmpty(data) && <H4>{'No activity so far'}</H4>}
+          {!loading && R.isEmpty(data?.serverLogs) && (
+            <H4>{'No activity so far'}</H4>
+          )}
         </div>
       </div>
     </>