diff --git a/code/game/g_main.c b/code/game/g_main.c
index af88d349..09287623 100644
--- a/code/game/g_main.c
+++ b/code/game/g_main.c
@@ -275,7 +275,7 @@ void G_FindTeams( void ) {
 
 	c = 0;
 	c2 = 0;
-	for ( i=1, e=g_entities+i ; i < level.num_entities ; i++,e++ ){
+	for ( i=MAX_CLIENTS, e=g_entities+i ; i < level.num_entities ; i++,e++ ) {
 		if (!e->inuse)
 			continue;
 		if (!e->team)
diff --git a/code/game/g_svcmds.c b/code/game/g_svcmds.c
index 755a7da3..3d377156 100644
--- a/code/game/g_svcmds.c
+++ b/code/game/g_svcmds.c
@@ -320,8 +320,8 @@ void	Svcmd_EntityList_f (void) {
 	int			e;
 	gentity_t		*check;
 
-	check = g_entities+1;
-	for (e = 1; e < level.num_entities ; e++, check++) {
+	check = g_entities;
+	for (e = 0; e < level.num_entities ; e++, check++) {
 		if ( !check->inuse ) {
 			continue;
 		}