diff --git a/src/server.c b/src/server.c
index c482eb1..293339c 100644
--- a/src/server.c
+++ b/src/server.c
@@ -4550,6 +4550,21 @@
 	return 0;
 
 out:
+	if (srv) {
+		/* remove the server from the proxy linked list */
+		if (be->srv == srv) {
+			be->srv = srv->next;
+		}
+		else {
+			struct server *prev;
+			for (prev = be->srv; prev && prev->next != srv; prev = prev->next)
+				;
+			if (prev)
+				prev->next = srv->next;
+		}
+
+	}
+
 	thread_release();
 	if (srv)
 		free_server(srv);