diff --git a/src/client/Client.java b/src/client/Client.java
index a4b070898d38d3f98e4d6f84e253b16675011279..b2026d632f16d15e2c141d35ba727af2bc37f38f 100644
--- a/src/client/Client.java
+++ b/src/client/Client.java
@@ -60,7 +60,7 @@ public class Client {
                 this.user.out.writeUTF("exit");
                 sc.close();
                 System.out.println("Disconnected");
-                break;
+                System.exit(1);
             }else {
                 out.writeUTF(to_send);
             }
diff --git a/src/client/ClientMessageReceptor.java b/src/client/ClientMessageReceptor.java
index c084881612b51d938766916de5bd5a28c8e09c05..fc64916d820f2ea987e958ed30448b0ab50d0838 100644
--- a/src/client/ClientMessageReceptor.java
+++ b/src/client/ClientMessageReceptor.java
@@ -34,7 +34,9 @@ public class ClientMessageReceptor extends Thread{
                     System.out.println(message);
                 }catch (EOFException e){
                     this.client.sock.close();
-                    break;
+                    System.out.println("___Déconnexion du serveur___");
+                    System.out.println("___Fin programme___");
+                    System.exit(1);
                 }
             }
         } catch (IOException e) {
diff --git a/src/server/Main.java b/src/server/Main.java
index 8e3e48e241570650ffefaed4970f52ed7a3c6465..38d755ea7d952e808c9f9a2fe1c6285d6f4108bb 100644
--- a/src/server/Main.java
+++ b/src/server/Main.java
@@ -1,7 +1,5 @@
 package server;
 
-import java.util.List;
-
 public class Main {
     public static void main(String[] args) {
         Serveur serveur = new Serveur();