diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index ad52d0775..07117b37c 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -337,7 +337,7 @@ enum
 
 /* the game snapshots are modifiable by the game */
 SNAPSTORAGE snapshot_storage;
-static SNAPSTORAGE_HOLDER *snapshots[NUM_SNAPSHOT_TYPES];
+static SNAPSTORAGE_HOLDER *snapshots[NUM_SNAPSHOT_TYPES] = {0, 0};
 
 static int recived_snapshots = 0;
 static char snapshot_incomming_data[MAX_SNAPSHOT_SIZE];
@@ -599,11 +599,13 @@ static void client_on_enter_game()
 
 void client_entergame()
 {
+	if(state == CLIENTSTATE_DEMOPLAYBACK)
+		return;
+		
 	/* now we will wait for two snapshots */
 	/* to finish the connection */
 	client_send_entergame();
 	client_on_enter_game();
-	/*netclient_flush(net);*/
 }
 
 void client_connect(const char *server_address_str)