diff --git a/radicale/server.py b/radicale/server.py
index 296fa2f3..26a2d1d8 100644
--- a/radicale/server.py
+++ b/radicale/server.py
@@ -325,8 +325,7 @@ def serve(configuration, shutdown_socket=None):
 
     with contextlib.ExitStack() as stack:
         for _, server in servers.items():
-            # close server
-            stack.push(server)
+            stack.callback(server.server_close)
         while True:
             rlist, _, xlist = select.select(
                 sockets, [], sockets, select_timeout)