diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java
index 732463e..5d76a21 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java
@@ -109,7 +109,7 @@ public class Game implements Serializable {
                 if(nextPlayer==null)
                 {
                     currentState.gameStageUpdate(GameStages.SLOT_CHOICE);
-                    currentState.playerUpdate(orderLogicCard.pull(),null);
+                    nextPlayerSetup();
                     return true;
                 }
             }
@@ -163,10 +163,12 @@ public class Game implements Serializable {
             }
             else {
                 totemChoiceQueue.removeIf(x->x.getUserName().equals(player.getUserName()));
+                player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
                 if (totemChoiceQueue.isEmpty()) {
                     player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
-                } else {
-                    totemChoiceQueue.add(player);
+                    currentState.gameStageUpdate(GameStages.SLOT_CHOICE);
+                    nextPlayerSetup();
+                    return true;
                 }
                 currentState.playerUpdate(totemChoiceQueue.poll(), null);
             }