diff --git a/src/main/java/net/rptools/maptool/server/MapToolServer.java b/src/main/java/net/rptools/maptool/server/MapToolServer.java
index 36a4a82990..ef4729fb9b 100644
--- a/src/main/java/net/rptools/maptool/server/MapToolServer.java
+++ b/src/main/java/net/rptools/maptool/server/MapToolServer.java
@@ -348,21 +348,6 @@ public void stop() {
       return;
     }
 
-    server.close();
-    for (var connection : router.removeAll()) {
-      connection.removeDisconnectHandler(onConnectionDisconnected);
-      connection.close();
-    }
-
-    assetManagerMap.clear();
-
-    if (heartbeatThread != null) {
-      heartbeatThread.shutdown();
-    }
-    if (assetProducerThread != null) {
-      assetProducerThread.shutdown();
-    }
-
     if (announcer != null) {
       announcer.stop();
       announcer = null;
@@ -382,6 +367,21 @@ public void stop() {
       int port = config.getPort();
       UPnPUtil.closePort(port);
     }
+
+    server.close();
+    for (var connection : router.removeAll()) {
+      connection.removeDisconnectHandler(onConnectionDisconnected);
+      connection.close();
+    }
+
+    assetManagerMap.clear();
+
+    if (heartbeatThread != null) {
+      heartbeatThread.shutdown();
+    }
+    if (assetProducerThread != null) {
+      assetProducerThread.shutdown();
+    }
   }
 
   public void start() throws IOException {