diff --git a/src/game/GameState.cpp b/src/game/GameState.cpp
index 5b6ba13..55d3f8e 100644
--- a/src/game/GameState.cpp
+++ b/src/game/GameState.cpp
@@ -200,7 +200,6 @@ namespace UNO::GAME {
 
     void ServerGameState::init()
     {
-        this->drawCount_ = 0;
         SPDLOG_INFO("Initializing server game state");
         while (discardPile_.isEmpty() || discardPile_.getFront().getType() > CardType::NUM9) {
             discardPile_.add(deck_.draw());
diff --git a/src/game/GameState.h b/src/game/GameState.h
index dbe791f..18b9c1a 100644
--- a/src/game/GameState.h
+++ b/src/game/GameState.h
@@ -297,6 +297,7 @@ namespace UNO::GAME {
     template<PlayerStateTypeConcept PlayerStateType>
     void GameState<PlayerStateType>::endGame()
     {
+        drawCount_ = 0;
         discardPile_.clear();
         for (auto &player : this->players_) {
             player.clear();