diff --git a/statistics/src/main/java/de/cotto/lndmanagej/statistics/OnlinePeersUpdater.java b/statistics/src/main/java/de/cotto/lndmanagej/statistics/OnlinePeersUpdater.java
index 7ebc9b19..230ca1bc 100644
--- a/statistics/src/main/java/de/cotto/lndmanagej/statistics/OnlinePeersUpdater.java
+++ b/statistics/src/main/java/de/cotto/lndmanagej/statistics/OnlinePeersUpdater.java
@@ -2,7 +2,6 @@ package de.cotto.lndmanagej.statistics;
 
 import de.cotto.lndmanagej.model.LocalChannel;
 import de.cotto.lndmanagej.model.Node;
-import de.cotto.lndmanagej.model.OnlineStatus;
 import de.cotto.lndmanagej.onlinepeers.OnlinePeersDao;
 import de.cotto.lndmanagej.service.ChannelService;
 import de.cotto.lndmanagej.service.NodeService;
@@ -11,7 +10,6 @@ import org.springframework.stereotype.Component;
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 @Component
@@ -38,10 +36,8 @@ public class OnlinePeersUpdater {
     }
 
     private boolean shouldUpdate(Node node) {
-        Optional<OnlineStatus> mostRecentOnlineStatus = dao.getMostRecentOnlineStatus(node.pubkey());
-        if (mostRecentOnlineStatus.isEmpty()) {
-            return true;
-        }
-        return mostRecentOnlineStatus.get().online() != node.online();
+        return dao.getMostRecentOnlineStatus(node.pubkey())
+                .map(onlineStatus -> onlineStatus.online() != node.online())
+                .orElse(true);
     }
 }
diff --git a/ui/src/main/java/de/cotto/lndmanagej/ui/WarningServiceImpl.java b/ui/src/main/java/de/cotto/lndmanagej/ui/WarningServiceImpl.java
index 4ef7736a..d6e73b08 100644
--- a/ui/src/main/java/de/cotto/lndmanagej/ui/WarningServiceImpl.java
+++ b/ui/src/main/java/de/cotto/lndmanagej/ui/WarningServiceImpl.java
@@ -51,9 +51,7 @@ public class WarningServiceImpl extends WarningService {
         Map<LocalOpenChannel, ChannelWarnings> channelWarnings = channelWarningsService.getChannelWarnings();
         channelWarnings.entrySet().stream()
                 .sorted(Comparator.comparing(e -> e.getKey().getId()))
-                .forEach(entry -> {
-                    addChannelWarnings(dashboardWarnings, entry.getKey(), entry.getValue());
-                });
+                .forEach(entry -> addChannelWarnings(dashboardWarnings, entry.getKey(), entry.getValue()));
 
         return dashboardWarnings;
     }