diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index 3298a3ee5..e0222324c 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -221,7 +221,7 @@ void K_UpdateMatchRaceBots(void)
 		{
 			pmax = std::min<UINT8>(pmax, static_cast<UINT8>(cv_maxplayers.value));
 		}
-		if (cv_maxplayers.value > 0)
+		if (cv_ingamecap.value > 0)
 		{
 			pmax = std::min<UINT8>(pmax, static_cast<UINT8>(cv_ingamecap.value));
 		}
@@ -322,7 +322,7 @@ void K_UpdateMatchRaceBots(void)
 			{
 				UINT8 index = P_RandomKey(usableskins);
 				skinnum = grabskins[index];
-				if (usableskins > cv_ingamecap.value)
+				if (((cv_ingamecap.value > 0) && (usableskins > cv_ingamecap.value)) || (usableskins > cv_maxplayers.value))
 				{
 					grabskins[index] = grabskins[--usableskins];
 				}
diff --git a/src/k_kart.c b/src/k_kart.c
index fab6b394d..4bbd19786 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -9892,7 +9892,7 @@ void K_CheckSpectateStatus(boolean considermapreset)
 		return;
 
 	// DON'T allow if you've hit the in-game player cap
-	if (cv_maxplayers.value && numhumans >= cv_maxplayers.value)
+	if (cv_ingamecap.value && numhumans >= cv_ingamecap.value)
 		return;
 
 	// Get the number of players in game, and the players to be de-spectated.