diff --git a/pkg/demoinfocs/datatables.go b/pkg/demoinfocs/datatables.go
index f664c8bf..7bea36a5 100644
--- a/pkg/demoinfocs/datatables.go
+++ b/pkg/demoinfocs/datatables.go
@@ -432,6 +432,8 @@ func (p *parser) bindNewPlayerController(controllerEntity st.Entity) {
 	controllerEntity.OnDestroy(func() {
 		pl.IsConnected = false
 		delete(p.gameState.playersByEntityID, controllerEntity.ID())
+		delete(p.gameState.playerControllerEntities, controllerEntity.ID())
+		delete(p.gameState.playersByUserID, pl.UserID)
 	})
 }