diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java
index c566dd1..472b62c 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java
@@ -101,7 +101,7 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
                 System.out.println("Game Created With :"+preferredInt+" Players");
             }
             if(controller.getModel().getCurrentState().getGameStage()!= GameStages.WAITING ) {
-                if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))) {
+                if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {
                     return ErrorType.GAME_ALREADY_STARTED;
                 }
             }
diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
index 2e10325..ecb9fea 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
@@ -167,7 +167,7 @@ public class TCPServer {
                         System.out.println("Game Created With :"+eventAddPlayer.getProposedNPlayer()+" Players");
                     }
                     if(controller.getModel().getCurrentState().getGameStage()!= GameStages.WAITING ) {
-                        if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))) {
+                        if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {
                             eventAddPlayer.setErrorType(ErrorType.GAME_ALREADY_STARTED);
                             eventAddPlayer.setIsError(true);
                             clientSend.writeObject(eventAddPlayer);