diff --git a/RageCoop.Server/Program.cs b/RageCoop.Server/Program.cs
index 2dd0e73..de20164 100644
--- a/RageCoop.Server/Program.cs
+++ b/RageCoop.Server/Program.cs
@@ -38,7 +38,7 @@ namespace RageCoop.Server
                             server.Stop();
                             mainLogger.Info("Server stopped.");
                             mainLogger.Dispose();
-                            Thread.Sleep(3000);
+                            Thread.Sleep(1000);
                             Environment.Exit(0);
                         }
                         else
diff --git a/RageCoop.Server/Server.cs b/RageCoop.Server/Server.cs
index a3b5ef0..1214c3e 100644
--- a/RageCoop.Server/Server.cs
+++ b/RageCoop.Server/Server.cs
@@ -246,8 +246,11 @@ namespace RageCoop.Server
             _stopping = true;
             Logger?.Flush();
             _listenerThread.Join();
-            _announceThread.Join();
             _latencyThread.Join();
+            if (_announceThread.IsAlive)
+            {
+                _announceThread.Join();
+            }
             _worker.Dispose();
         }
         private void Listen()