diff --git a/ServerManagement/Components/Controls/ServerListComponent.razor b/ServerManagement/Components/Controls/ServerListComponent.razor
index 019d424..dfa5b93 100644
--- a/ServerManagement/Components/Controls/ServerListComponent.razor
+++ b/ServerManagement/Components/Controls/ServerListComponent.razor
@@ -40,4 +40,23 @@
       servers = ServersRepository.SearchServers(SearchFilter);
     }
   }
+
+  protected override void OnAfterRender(bool firstRender)
+  {
+    base.OnAfterRender(firstRender);
+
+    if (firstRender)
+    {
+      if (string.IsNullOrWhiteSpace(this.SearchFilter))
+      {
+        servers = ServersRepository.GetServersByCity(CityName ?? "Eindhoven");
+      }
+      else
+      {
+        servers = ServersRepository.SearchServers(SearchFilter);
+      }
+      // Render the component again by letting it know the state changed.
+      StateHasChanged();
+    }
+  }
 }
\ No newline at end of file