diff --git a/Client.py b/Client.py
index ec03dcf..1d40be1 100644
--- a/Client.py
+++ b/Client.py
@@ -4,17 +4,14 @@ SOCKET = socket.socket()
 HOST = socket.gethostname()
 PORT = 45670
 
-# Verbindung zum Server
 SOCKET.connect((HOST, PORT))
 
-
 while True:
     eingabe = input("Eingabe: ")
     msg = eingabe.encode("utf-8")
 
     SOCKET.send(msg)
 
-
     if eingabe.upper() == "STOP":
         SOCKET.close()
         break
@@ -24,6 +21,4 @@ while True:
 
     print(msg)
 
-
-
 SOCKET.close()
\ No newline at end of file
diff --git a/Server.py b/Server.py
index ea18e3d..6dc8518 100644
--- a/Server.py
+++ b/Server.py
@@ -4,29 +4,27 @@ SOCKET = socket.socket()
 HOST = socket.gethostname()
 PORT = 45670
 
-
 SOCKET.bind((HOST, PORT))
 SOCKET.listen()
 
 
 while True:
     (connection, addr) = SOCKET.accept()
-
     print("Server: " + addr[0] + "    Port: " + str(addr[1]))
 
-    eingabe = connection.recv(1024)
+    while True:
+        eingabe = connection.recv(1024)
 
-    msg = eingabe.decode("utf-8")
-    msg = msg.upper()
+        msg = eingabe.decode("utf-8")
+        msg = msg.upper()
 
-    print(msg)
+        print(msg)
 
-    if msg == "STOP":
-        connection.close()
-        SOCKET.close()
-        break
+        if msg == "STOP":
+            break
 
-    connection.send(msg.encode("utf-8"))
+        connection.send(msg.encode("utf-8"))
 
+    connection.close()
 
 SOCKET.close()
\ No newline at end of file