diff --git a/amxmodx/emsg.cpp b/amxmodx/emsg.cpp
index 3f59304d..1e43fd4c 100755
--- a/amxmodx/emsg.cpp
+++ b/amxmodx/emsg.cpp
@@ -109,6 +109,7 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
+			g_players[index].teamId = g_teamsIds.findTeamId(msg);
 			break;
 	}
 }