diff --git a/Source/Common/PlayerManager.cs b/Source/Common/PlayerManager.cs
index cc3da928..f274a758 100644
--- a/Source/Common/PlayerManager.cs
+++ b/Source/Common/PlayerManager.cs
@@ -71,10 +71,10 @@ public void SetDisconnected(ConnectionBase conn, MpDisconnectReason reason)
             ServerPlayer player = conn.serverPlayer;
             Players.Remove(player);
 
-            if (player.IsHost && server.worldData.CreatingJoinPoint)
+            if (server.worldData.CreatingJoinPoint && (player.IsHost || !Players.Any(p => p.hasJoined)))
             {
                 server.worldData.AbortJoinPointCreation();
-                ServerLog.Log("Aborted join point creation because the host disconnected.");
+                ServerLog.Log("Aborted join point creation because no players remain.");
             }
 
             if (player.hasJoined)