diff --git a/src/Connection/Connection.py b/src/Connection/Connection.py
index fb357955..c9455d15 100644
--- a/src/Connection/Connection.py
+++ b/src/Connection/Connection.py
@@ -133,7 +133,7 @@ class Connection(object):
 
         self.unpacker = msgpack.Unpacker()
         try:
-            while True:
+            while not self.closed:
                 buff = self.sock.recv(16 * 1024)
                 if not buff:
                     break  # Connection closed