diff --git a/WebfrontCore/ViewComponents/ServerListViewComponent.cs b/WebfrontCore/ViewComponents/ServerListViewComponent.cs
index f1dfc5c5..2252760e 100644
--- a/WebfrontCore/ViewComponents/ServerListViewComponent.cs
+++ b/WebfrontCore/ViewComponents/ServerListViewComponent.cs
@@ -37,7 +37,7 @@ namespace WebfrontCore.ViewComponents
             {
                 var serverId = server.GetIdForServer().Result;
                 var clientHistory = _serverDataViewer.ClientHistoryAsync(_appConfig.MaxClientHistoryTime,
-                                            CancellationToken.None).Result
+                                            CancellationToken.None).Result?
                                         .FirstOrDefault(history => history.ServerId == serverId) ??
                                     new ClientHistoryInfo
                                     {