diff --git a/csgo/demo_parser.go b/csgo/demo_parser.go
index 6213940..5482852 100644
--- a/csgo/demo_parser.go
+++ b/csgo/demo_parser.go
@@ -367,7 +367,7 @@ func (p *DemoParser) parseWorker() {
 
 		// onPlayerConnected
 		demoParser.RegisterEventHandler(func(e events.PlayerTeamChange) {
-			if e.Player != nil {
+			if e.Player != nil && e.Player.SteamID64 != 0 {
 				tMatchPlayer := p.getMatchPlayerBySteamID(tStats, e.Player.SteamID64)
 				setMatchPlayerColor(tMatchPlayer, e.Player)
 			}
@@ -380,7 +380,6 @@ func (p *DemoParser) parseWorker() {
 			for _, demoPlayer := range gs.Participants().Playing() {
 				if demoPlayer != nil && demoPlayer.SteamID64 != 0 {
 					tMatchPlayer := p.getMatchPlayerBySteamID(tStats, demoPlayer.SteamID64)
-
 					setMatchPlayerColor(tMatchPlayer, demoPlayer)
 				}
 			}