diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
index db4bfcb..b937467 100644
--- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
+++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java
@@ -29,7 +29,7 @@ public class GUI extends Application implements IView {
     FXMLLoader loaderMain;
     Scene mainScene;
     MainFXMLController controllerMain;
-
+    MiniModel miniModel;
     FXMLLoader loaderLeaderboard;
     Scene leaderboardScene;
     LeaderboardFXMLController controllerLeaderboard;
@@ -91,8 +91,7 @@ public class GUI extends Application implements IView {
 
     @Override
     public void setModel(MiniModel miniModel) {
-        this.controller.setModel(miniModel);
-
+        this.miniModel=miniModel;
     }
 
     public void setController(ClientController controller) {
@@ -103,7 +102,7 @@ public class GUI extends Application implements IView {
         Platform.runLater(() -> {
             boolean toFull=false;
 
-            synchronized (controller.miniModel) {
+            synchronized (miniModel) {
                 if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
                     if (primaryStage.getScene()!=leaderboardScene) {
                         toFull=true;
@@ -146,7 +145,7 @@ public class GUI extends Application implements IView {
                 controllerLogin.showError(error);
                 primaryStage.setFullScreen(true);
             }else {
-                synchronized (controller.miniModel) {
+                synchronized (miniModel) {
                     controllerMain.isError = true;
                     controllerMain.render();
 
diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
index 8f7b029..abbff7b 100644
--- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
+++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java
@@ -111,7 +111,8 @@ public class MainFXMLController {
 
     // ==== RENDER ====
     public void render() {
-        if(foodLabels.isEmpty())
+        if(foodLabels.isEmpty() || controller.miniModel.lastEvent == null
+                || controller.miniModel.lastEvent.getEventType().equals(EventType.TOTEM_CHOICE))
             buildSidePanel();
         if(isError)
         {