diff --git a/code/game/g_bot.c b/code/game/g_bot.c
index af4906a3..b5731a67 100644
--- a/code/game/g_bot.c
+++ b/code/game/g_bot.c
@@ -724,6 +724,9 @@ static void G_AddBot( const char *name, float skill, const char *team, int delay
 	}
 	Info_SetValueForKey( userinfo, "characterfile", s );
 
+	// don't send tinfo to bots, they don't parse it
+	Info_SetValueForKey( userinfo, "teamoverlay", "0" );
+
 	// register the userinfo
 	trap_SetUserinfo( clientNum, userinfo );
 
diff --git a/code/game/g_client.c b/code/game/g_client.c
index 89f20982..3366d176 100644
--- a/code/game/g_client.c
+++ b/code/game/g_client.c
@@ -803,7 +803,7 @@ void ClientUserinfoChanged( int clientNum ) {
 */
 
 #ifdef MISSIONPACK
-	if (g_gametype.integer >= GT_TEAM) {
+	if (g_gametype.integer >= GT_TEAM && !(ent->r.svFlags & SVF_BOT)) {
 		client->pers.teamInfo = qtrue;
 	} else {
 		s = Info_ValueForKey( userinfo, "teamoverlay" );