diff --git a/docs/faq/server.rst b/docs/faq/server.rst
index 08b412d3..cba1cd35 100644
--- a/docs/faq/server.rst
+++ b/docs/faq/server.rst
@@ -300,7 +300,8 @@ Here's how to adapt the example just above::
 
         server = await websockets.serve(echo, "localhost", 8765)
         await stop
-        await server.close(close_connections=False)
+        server.close(close_connections=False)
+        await server.wait_closed()
 
 How do I implement a health check?
 ----------------------------------
diff --git a/src/websockets/legacy/server.py b/src/websockets/legacy/server.py
index 0f3c1c15..001d1364 100644
--- a/src/websockets/legacy/server.py
+++ b/src/websockets/legacy/server.py
@@ -899,7 +899,8 @@ class Serve:
 
         server = await serve(...)
         await stop
-        await server.close()
+        server.close()
+        await server.wait_closed()
 
     :func:`serve` can be used as an asynchronous context manager. Then, the
     server is shut down automatically when exiting the context::