diff --git a/src/somnus/logic/stop.py b/src/somnus/logic/stop.py
index 1b16f21..f54fca1 100644
--- a/src/somnus/logic/stop.py
+++ b/src/somnus/logic/stop.py
@@ -41,6 +41,10 @@ async def _stop_mc_server(ssh: pxssh.pxssh, config: Config):
 
     log.debug("Sending stop command ...")
     ssh.sendline("stop")
+    messages = ["overworld", "the_end", "nether"]
+    for message in messages:
+        ssh.expect(message)
+        yield
     ssh.prompt()
     yield