diff --git a/server/Server.py b/server/Server.py
index 866eef0..5b3a01a 100644
--- a/server/Server.py
+++ b/server/Server.py
@@ -134,11 +134,11 @@ class Server:
   def _end(self, game_state:dict):
     if self.store_game_state:
       game_board = self._get_game_board(game_state, end=True)
-      if not game_board.get_winner() == "me" and not game_board.get_turn() <= self.store_game_when_win_and_moves_are_bigger_as:
-        game_board.save(
-          StorageLoader.build(self.storage_type),
-          file_path=os.path.join(self.data_path, 'data'),
-        )
+      #if not game_board.get_winner() == "me" and not game_board.get_turn() <= self.store_game_when_win_and_moves_are_bigger_as:
+      game_board.save(
+        StorageLoader.build(self.storage_type),
+        file_path=os.path.join(self.data_path, 'data'),
+      )
 
     print("GAME ENDED: Winner is", [ x["name"] for x in game_state["board"]['snakes']])
     self._delete_game_board(game_state)
diff --git a/server/storage/EdgeDB.py b/server/storage/EdgeDB.py
index 44d7e6b..200896c 100644
--- a/server/storage/EdgeDB.py
+++ b/server/storage/EdgeDB.py
@@ -71,7 +71,7 @@ class EdgeDB:
       url=game_board.url if game_board.url else "",
       created_at=datetime.fromtimestamp(game_board.now_date.timestamp(), game_board.now_date.astimezone().tzinfo),
       turns=game_board.turn,
-      map=game_board.map,
+      map=game_board.map if game_board.map else "standard",
       winner=', '.join(game_board.winner_snake_names) if game_board.winner_snake_names else "",
       moves=[ tuple([ele["turn"], ele["move"], json.dumps(ele["game_board"])]) for ele in game_board.turns ],