diff --git a/handler/routes.go b/handler/routes.go
index 4ed65a6..f204c9b 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -709,6 +709,19 @@ func CreateServer(db store.IStore) echo.HandlerFunc {
 	}
 }
 
+// RemoveServer handler deletes a server, refusing if any client still
+// references it (see store.DeleteServer). Admin-only.
+func RemoveServer(db store.IStore) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		serverID := c.Param("id")
+		if err := db.DeleteServer(serverID); err != nil {
+			return c.JSON(http.StatusBadRequest, jsonHTTPResponse{false, err.Error()})
+		}
+		log.Infof("Removed server %s", serverID)
+		return c.JSON(http.StatusOK, jsonHTTPResponse{true, "Server removed successfully"})
+	}
+}
+
 // NewClient handler
 func NewClient(db store.IStore) echo.HandlerFunc {
 	return func(c echo.Context) error {
diff --git a/main.go b/main.go
index e5596c6..2cbc8ec 100644
--- a/main.go
+++ b/main.go
@@ -264,6 +264,7 @@ func main() {
 	app.POST(util.BasePath+"/servers/:id/settings", handler.SaveServerSettingsHandler(db), handler.ValidSession, handler.ContentTypeJson, handler.NeedsAdmin)
 	app.POST(util.BasePath+"/servers/:id/interface", handler.UpdateServerInterfaceHandler(db), handler.ValidSession, handler.ContentTypeJson, handler.NeedsAdmin)
 	app.POST(util.BasePath+"/servers/:id/keypair", handler.UpdateServerKeyPairHandler(db), handler.ValidSession, handler.ContentTypeJson, handler.NeedsAdmin)
+	app.POST(util.BasePath+"/servers/:id/delete", handler.RemoveServer(db), handler.ValidSession, handler.ContentTypeJson, handler.NeedsAdmin)
 	app.POST(util.BasePath+"/backup/download", handler.DownloadBackup(db), handler.ValidSession, handler.ContentTypeJson, handler.NeedsAdmin)
 	app.GET(util.BasePath+"/api/clients", handler.GetClients(db), handler.ValidSession)
 	app.GET(util.BasePath+"/api/client/:id", handler.GetClient(db), handler.ValidSession)
diff --git a/templates/servers.html b/templates/servers.html
index c504c8a..f40c164 100644
--- a/templates/servers.html
+++ b/templates/servers.html
@@ -203,6 +203,9 @@ All Servers
                                         <button type="button" class="btn btn-outline-secondary btn-sm" data-toggle="modal"
                                             data-target="#modal_server_interface" data-serverid="${obj.id}">Interface</button>
                                     </div>
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-outline-danger btn-sm btn-delete-server" data-serverid="${obj.id}" data-servername="${safeName}">Delete</button>
+                                    </div>
                                     <hr>
                                     <span class="info-box-text"><i class="fas fa-server"></i> ${safeName}</span>
                                     <span class="info-box-text"><i class="fas fa-fingerprint"></i> ID: ${obj.id}</span>
@@ -470,6 +473,34 @@ All Servers
         });
     });
 
+    // Delete server button: rendered dynamically, use event delegation
+    $(document).ready(function () {
+        $('#servers-list').on('click', '.btn-delete-server', function () {
+            const serverId = $(this).data('serverid');
+            const serverName = $(this).data('servername');
+            if (!confirm("Are you sure you want to delete server \"" + serverName + "\" (" + serverId + ")?\n" +
+                "This only works if no clients are assigned to it anymore.")) {
+                return;
+            }
+            $.ajax({
+                cache: false,
+                method: 'POST',
+                url: '{{.basePath}}/servers/' + serverId + '/delete',
+                dataType: 'json',
+                contentType: "application/json",
+                success: function (data) {
+                    toastr.success("Server deleted successfully");
+                    $('#servers-list').empty();
+                    populateServersList();
+                },
+                error: function (jqXHR, exception) {
+                    const responseJson = jQuery.parseJSON(jqXHR.responseText);
+                    toastr.error(responseJson['message']);
+                }
+            });
+        });
+    });
+
     $(document).ready(function () {
         $.validator.setDefaults({
             submitHandler: function (form) {