diff --git a/src/client/panels/TrickEstimationPanel.cpp b/src/client/panels/TrickEstimationPanel.cpp
index e710f1e620b3cc784c717c7ccc22228bab125381..38e3f76caec056d6e672828136eda9f591742dce 100644
--- a/src/client/panels/TrickEstimationPanel.cpp
+++ b/src/client/panels/TrickEstimationPanel.cpp
@@ -129,7 +129,7 @@ void TrickEstimationPanel::buildThisPlayer(wxGridBagSizer* sizer, game_state* ga
     mePanelSizer_hor->Add(playerName, 0, wxALIGN_CENTER);
 
     // if we have not submitted estimate yet
-    if (me->get_nof_tricks() == -1)
+    if (me->get_nof_predicted() == -1)
     {
         if (gameState->get_current_player() == me)
         {
diff --git a/src/common/game_state/player/player.cpp b/src/common/game_state/player/player.cpp
index 8a5189233262d7975af88cf142990e2feafb0014..5d6e2c61063a479c195ea630fbfe096bf564de64 100644
--- a/src/common/game_state/player/player.cpp
+++ b/src/common/game_state/player/player.cpp
@@ -5,7 +5,7 @@
 // constructor for client
 player::player(const std::string& name) : unique_serializable() {
     this->_player_name = new serializable_value<std::string>(name);
-    this->_nof_predicted = new serializable_value<int>(0);
+    this->_nof_predicted = new serializable_value<int>(-1);
     this->_nof_tricks = new serializable_value<int>(0);
     this->_scores = std::vector<serializable_value<int>*>(0);
     this->_hand = new hand();
@@ -48,7 +48,7 @@ player::player(const std::string& id, const std::string& name) :
     this->_player_name = new serializable_value<std::string>(name);
     this->_scores = std::vector< serializable_value<int>*>(0);
     this->_hand = new hand();
-    this->_nof_predicted = new serializable_value<int>(0);
+    this->_nof_predicted = new serializable_value<int>(-1);
     this->_nof_tricks = new serializable_value<int>(0);
 }
 
@@ -120,7 +120,7 @@ unsigned int player::get_nof_cards() const noexcept
 #ifdef WIZARD_SERVER
 void player::setup_round()
 {
-    _nof_predicted->set_value(0);
+    _nof_predicted->set_value(-1);
     _nof_tricks->set_value(0);
     //delete _hand;
     //_hand = new hand();