diff --git a/ServerManagement/Components/Controls/CityListComponent.razor b/ServerManagement/Components/Controls/CityListComponent.razor
index a812883..bccb87b 100644
--- a/ServerManagement/Components/Controls/CityListComponent.razor
+++ b/ServerManagement/Components/Controls/CityListComponent.razor
@@ -22,6 +22,10 @@
   [Parameter]
   public EventCallback<string> SelectCityCallBack { get; set; }
 
+  public void ClearSelection()
+  {
+    this.selectedCity = string.Empty;
+  }
   private void HandleCitySelection(string cityName)
   {
     this.selectedCity = cityName;
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index 4da62b9..9886662 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -4,7 +4,7 @@
 <h3>Servers</h3>
 <br/>
 <br/>
-<CityListComponent SelectCityCallBack="HandleCitySelection"></CityListComponent>
+<CityListComponent @ref="cityListComponent" SelectCityCallBack="HandleCitySelection"></CityListComponent>
 <br/>
 <SearchBarComponent FilterSearchTerm="HandleSearch"></SearchBarComponent>
 <br/>
@@ -20,6 +20,7 @@
 @code {
   private string selectedCity = "Eindhoven";
   private string searchFilter = "";
+  private CityListComponent? cityListComponent;
 
   private void HandleCitySelection(string cityName)
   {
@@ -29,7 +30,7 @@
 
   private void HandleSearch(string searchFilter)
   {
-    this.selectedCity = string.Empty;
     this.searchFilter = searchFilter;
+    cityListComponent?.ClearSelection();
   }
 }
\ No newline at end of file