diff --git a/ServerManagement/Components/Pages/EditServer.razor b/ServerManagement/Components/Pages/EditServer.razor
index b3c9780..8b833e1 100644
--- a/ServerManagement/Components/Pages/EditServer.razor
+++ b/ServerManagement/Components/Pages/EditServer.razor
@@ -1,7 +1,32 @@
-@page "/servers/edit"
+@page "/servers/{id:int}"
+@* Route constraints: https://learn.microsoft.com/en-us/aspnet/core/fundamentals/routing?view=aspnetcore-9.0#route-constraints *@
 
-<p>Edit server</p>
+<h3>Edit server</h3>
+<br/>
+<br/>
+
+@if (server != null)
+{
+  <p>
+    @server.Name
+  </p>
+  <p>
+    @server.City
+  </p>
+  <p>
+    @server.IsOnline
+  </p>
+}
+<br/>
+<a href="/servers" class="btn btn-primary">Close</a>
 
 @code {
-  
+  [Parameter] // This is a root parameter.
+  public int Id { get; set; }
+  private Server? server;
+
+  protected override void OnParametersSet()
+  {
+    server = ServersRepository.GetServerById(this.Id);
+  }
 }
\ No newline at end of file
diff --git a/ServerManagement/Components/Pages/Servers.razor b/ServerManagement/Components/Pages/Servers.razor
index d5ae8c9..70fa32b 100644
--- a/ServerManagement/Components/Pages/Servers.razor
+++ b/ServerManagement/Components/Pages/Servers.razor
@@ -32,7 +32,7 @@
         @(server.IsOnline ? "online" : "offline")
       </span>;
       &nbsp;
-      <a href="/servers/edit" class="btn btn-link">Edit</a>
+      <a href="@($"/servers/{server.Id}")" class="btn btn-link">Edit</a>
     </li>
   }
 </ul>