diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
index b96b567d..f349a1bc 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -637,8 +637,6 @@ void SetTeam( gentity_t *ent, const char *s ) {
 		CheckTeamLeader( oldTeam );
 	}
 
-	BroadcastTeamChange( client, oldTeam );
-
 	// get and distribute relevant parameters
 	ClientUserinfoChanged( clientNum );
 
@@ -647,6 +645,8 @@ void SetTeam( gentity_t *ent, const char *s ) {
 		return;
 	}
 
+	BroadcastTeamChange( client, oldTeam );
+
 	ClientBegin( clientNum );
 }