diff --git a/BitTorrent/Peer/TorrentPeerCommunicator.swift b/BitTorrent/Peer/TorrentPeerCommunicator.swift
index dd58220..2e70813 100644
--- a/BitTorrent/Peer/TorrentPeerCommunicator.swift
+++ b/BitTorrent/Peer/TorrentPeerCommunicator.swift
@@ -64,11 +64,18 @@ class TorrentPeerCommunicator {
         self.connection.delegate = self
         self.handshakeMessageBuffer.delegate = self
         self.messageBuffer.delegate = self
+        
+        self.connection.readData(withTimeout: -1, tag: 0)
     }
     
     func connect() throws {
         try connection.connect(to: peerInfo.ip, onPort: peerInfo.port)
     }
+}
+
+// MARK: - Writing messages
+
+extension TorrentPeerCommunicator {
     
     func sendHandshake(for infoHash: Data, clientId: Data, _ completion: (()->Void)? = nil) {
         
@@ -85,9 +92,8 @@ class TorrentPeerCommunicator {
         connection.write(payload, withTimeout: defaultTimeout, completion: completion)
     }
     
-    private let keepAlivePayload = Data(bytes: [0, 0, 0, 0]) // 0 length message
-    
     func sendKeepAlive(_ completion: (()->Void)? = nil) {
+        let keepAlivePayload = Data(bytes: [0, 0, 0, 0]) // 0 length message
         connection.write(keepAlivePayload, withTimeout: defaultTimeout, completion: completion)
     }
     
@@ -154,7 +160,7 @@ class TorrentPeerCommunicator {
     }
 }
 
-// MARK: -
+// MARK: - Reading messages
 
 extension TorrentPeerCommunicator: TCPConnectionDelegate {
     
@@ -169,6 +175,8 @@ extension TorrentPeerCommunicator: TCPConnectionDelegate {
         } else {
             messageBuffer.appendData(data)
         }
+        
+        connection.readData(withTimeout: -1, tag: 0)
     }
     
     func tcpConnection(_ sender: TCPConnectionProtocol, didWriteDataWithTag tag: Int) {
diff --git a/BitTorrent/Peer/TorrentPeerCommunicatorTests.swift b/BitTorrent/Peer/TorrentPeerCommunicatorTests.swift
index 876a5f4..e88cc98 100644
--- a/BitTorrent/Peer/TorrentPeerCommunicatorTests.swift
+++ b/BitTorrent/Peer/TorrentPeerCommunicatorTests.swift
@@ -115,6 +115,18 @@ class TorrentPeerComminicatorTests: XCTestCase {
         XCTAssertEqual(tcpConnection.connectParameters?.port, port)
     }
     
+    func test_tcpConnectionIsConstantlyReadingNewData() {
+        XCTAssert(tcpConnection.readDataCalled)
+        XCTAssertEqual(tcpConnection.readDataParameters?.timeout, -1)
+        
+        if let tag = tcpConnection.readDataParameters?.tag {
+            tcpConnection.readDataCalled = false
+            sut.tcpConnection(tcpConnection, didRead: Data(), withTag: tag)
+            XCTAssert(tcpConnection.readDataCalled)
+            XCTAssertEqual(tcpConnection.readDataParameters?.timeout, -1)
+        }
+    }
+    
     func test_sendHandshake() {
         sut.sendHandshake(for: infoHash, clientId: peerId)
         assertDataSent(handshakePayload)