diff --git a/new-lamassu-admin/src/pages/MachineLogs.js b/new-lamassu-admin/src/pages/MachineLogs.js
index 62edb83d..dc25d57c 100644
--- a/new-lamassu-admin/src/pages/MachineLogs.js
+++ b/new-lamassu-admin/src/pages/MachineLogs.js
@@ -123,16 +123,21 @@ const Logs = () => {
                 <TableHeader className={classes.fillColumn} />
               </TableRow>
             </TableHead>
-            <TableBody>
-              {logsResponse &&
-                logsResponse.machineLogs.map((log, idx) => (
-                  <TableRow key={idx} size="sm">
-                    <TableCell>{formatDate(log.timestamp)}</TableCell>
-                    <TableCell>{log.logLevel}</TableCell>
-                    <TableCell>{log.message}</TableCell>
-                  </TableRow>
-                ))}
-            </TableBody>
+            {logsResponse &&
+              (!logsResponse.machineLogs.length ? (
+                <p>{'No activity so far'}</p>
+              ) : (
+                <TableBody>
+                  {logsResponse &&
+                    logsResponse.machineLogs.map((log, idx) => (
+                      <TableRow key={idx} size="sm">
+                        <TableCell>{formatDate(log.timestamp)}</TableCell>
+                        <TableCell>{log.logLevel}</TableCell>
+                        <TableCell>{log.message}</TableCell>
+                      </TableRow>
+                    ))}
+                </TableBody>
+              ))}
           </Table>
         </div>
       </div>
diff --git a/new-lamassu-admin/src/pages/ServerLogs.js b/new-lamassu-admin/src/pages/ServerLogs.js
index 789113a8..27442513 100644
--- a/new-lamassu-admin/src/pages/ServerLogs.js
+++ b/new-lamassu-admin/src/pages/ServerLogs.js
@@ -174,18 +174,22 @@ const Logs = () => {
             </TableHead>
             <TableBody>
               {data &&
-                data.serverLogs
-                  .filter(
-                    log =>
-                      logLevel === SHOW_ALL || log.logLevel === logLevel.code
-                  )
-                  .map((log, idx) => (
-                    <TableRow key={idx} size="sm">
-                      <TableCell>{formatDate(log.timestamp)}</TableCell>
-                      <TableCell>{log.logLevel}</TableCell>
-                      <TableCell>{log.message}</TableCell>
-                    </TableRow>
-                  ))}
+                (!data.serverLogs.length ? (
+                  <p>{'No activity so far'} </p>
+                ) : (
+                  data.serverLogs
+                    .filter(
+                      log =>
+                        logLevel === SHOW_ALL || log.logLevel === logLevel.code
+                    )
+                    .map((log, idx) => (
+                      <TableRow key={idx} size="sm">
+                        <TableCell>{formatDate(log.timestamp)}</TableCell>
+                        <TableCell>{log.logLevel}</TableCell>
+                        <TableCell>{log.message}</TableCell>
+                      </TableRow>
+                    ))
+                ))}
             </TableBody>
           </Table>
         </div>