diff --git a/ServerManagement/Components/Controls/ServerListComponent.razor b/ServerManagement/Components/Controls/ServerListComponent.razor
index b5cae85..bc53916 100644
--- a/ServerManagement/Components/Controls/ServerListComponent.razor
+++ b/ServerManagement/Components/Controls/ServerListComponent.razor
@@ -1,27 +1,37 @@
 @inject NavigationManager NavigationManager
 
-<ul>
-  <Virtualize Items="this.servers" Context="server">
-    <li @key="server.Id">
-      @server.Name in @server.City is
-      <span style="color:@(server.IsOnline ? "green" : "red")">
-        @(server.IsOnline ? "online" : "offline")
-      </span>;
-      &nbsp;
-      <a href="@($"/servers/{server.Id}")" class="btn btn-primary">Edit</a>
-      &nbsp;
-      <EditForm
-        Model="server"
-        FormName="@($"formDeleteServer{server.Id}")"
-        OnValidSubmit="@(() => { DeleteServer(server.Id); })">
-        <button type="submit" class="btn btn-danger">Delete</button>
-      </EditForm>
-    </li>
-  </Virtualize>
-</ul>
+@if (this.servers != null && this.servers.Count > 0)
+{
+  <ul>
+    <Virtualize Items="this.servers" Context="server">
+      <li @key="server.Id">
+        @server.Name in @server.City is
+        <span style="color:@(server.IsOnline ? "green" : "red")">
+          @(server.IsOnline ? "online" : "offline")
+        </span>;
+        &nbsp;
+        <a href="@($"/servers/{server.Id}")" class="btn btn-primary">Edit</a>
+        &nbsp;
+        <EditForm
+          Model="server"
+          FormName="@($"formDeleteServer{server.Id}")"
+          OnValidSubmit="@(() => { DeleteServer(server.Id); })">
+          <button type="submit" class="btn btn-danger">Delete</button>
+        </EditForm>
+      </li>
+    </Virtualize>
+  </ul>
+}
 
 @code {
-  private List<Server> servers = ServersRepository.GetServersByCity("Eindhoven");
+  [Parameter]
+  public string? CityName { get; set; }
+  private List<Server>? servers;
+
+  protected override void OnParametersSet()
+  {
+    servers = ServersRepository.GetServersByCity(CityName ?? "Eindhoven");
+  }
 
   private void DeleteServer(int serverId)
   {
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index b87b2c4..1868fe2 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -33,7 +33,7 @@
 <a href="@($"/servers/add")" class="btn btn-primary">Add</a>
 <br/>
 
-<ServerListComponent></ServerListComponent>
+<ServerListComponent CityName="@this.selectedCity"></ServerListComponent>
 
 @code {
   private List<string> cities = ServersRepository.GetCities();
@@ -52,7 +52,6 @@
   private void SelectCity(string cityName)
   {
     this.selectedCity = cityName;
-    //this.servers = ServersRepository.GetServersByCity(this.selectedCity);
   }
 
   private void HandleSearch()