diff --git a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/console/JdbcCommandExtension.java b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/console/JdbcCommandExtension.java
index c4d1f1fcd..8b6dcbbdb 100644
--- a/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/console/JdbcCommandExtension.java
+++ b/bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/console/JdbcCommandExtension.java
@@ -117,11 +117,10 @@ public class JdbcCommandExtension extends AbstractConsoleCommandExtension implem
             entries.removeIf(t -> t.getStatus() == ItemTableCheckEntryStatus.VALID);
         }
         entries.sort(Comparator.comparing(ItemTableCheckEntry::getTableName));
-        // FIXME: NoSuchElement when empty table - because of get()
         int itemNameMaxLength = Math
-                .max(entries.stream().map(t -> t.getItemName().length()).max(Integer::compare).get(), 4);
+                .max(entries.stream().map(t -> t.getItemName().length()).max(Integer::compare).orElse(0), 4);
         int tableNameMaxLength = Math
-                .max(entries.stream().map(t -> t.getTableName().length()).max(Integer::compare).get(), 5);
+                .max(entries.stream().map(t -> t.getTableName().length()).max(Integer::compare).orElse(0), 5);
         int statusMaxLength = Stream.of(ItemTableCheckEntryStatus.values()).map(t -> t.toString().length())
                 .max(Integer::compare).get();
         console.println(String.format(