diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index 72fb28abe..5d9f44677 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -542,21 +542,28 @@ static UINT32 K_BotRubberbandDistance(const player_t *player)
 			continue;
 		}
 
-		if (playeringame[i] && players[i].bot)
+		if (!playeringame[i] || players[i].spectator)
 		{
-			// First check difficulty levels, then score, then settle it with port priority!
-			if (player->botvars.difficulty < players[i].botvars.difficulty)
-			{
-				pos += 3;
-			}
-			else if (player->score < players[i].score)
-			{
-				pos += 2;
-			}
-			else if (i < portpriority)
-			{
-				pos += 1;
-			}
+			continue;
+		}
+
+		if (!players[i].bot)
+		{
+			continue;
+		}
+
+		// First check difficulty levels, then score, then settle it with port priority!
+		if (player->botvars.difficulty < players[i].botvars.difficulty)
+		{
+			pos += 3;
+		}
+		else if (player->score < players[i].score)
+		{
+			pos += 2;
+		}
+		else if (i < portpriority)
+		{
+			pos += 1;
 		}
 	}
 
diff --git a/src/k_botsearch.cpp b/src/k_botsearch.cpp
index 1a4e9cc57..b7a479456 100644
--- a/src/k_botsearch.cpp
+++ b/src/k_botsearch.cpp
@@ -543,6 +543,7 @@ static BlockItReturn_t K_FindObjectsForNudging(mobj_t *thing)
 			break;
 		case MT_PLAYER:
 			if (thing->player
+				&& !thing->player->spectator
 				&& !thing->player->hyudorotimer
 				&& !g_nudgeSearch.botmo->player->hyudorotimer)
 			{
@@ -902,7 +903,7 @@ static BlockItReturn_t K_FindPlayersToBully(mobj_t *thing)
 		return BMIT_CONTINUE;
 	}
 
-	if (!thing->player)
+	if (!thing->player || thing->player->spectator)
 	{
 		return BMIT_CONTINUE;
 	}