diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py
index 73b1088f0..f17943c11 100644
--- a/mitmproxy/net/tcp.py
+++ b/mitmproxy/net/tcp.py
@@ -569,7 +569,9 @@ class TCPClient(_Connection):
         # Make sure to close the real socket, not the SSL proxy.
         # OpenSSL is really good at screwing up, i.e. when trying to recv from a failed connection,
         # it tries to renegotiate...
-        if isinstance(self.connection, SSL.Connection):
+        if not self.connection:
+            return
+        elif isinstance(self.connection, SSL.Connection):
             close_socket(self.connection._socket)
         else:
             close_socket(self.connection)
diff --git a/mitmproxy/proxy/protocol/http_replay.py b/mitmproxy/proxy/protocol/http_replay.py
index 25867871f..1aa918472 100644
--- a/mitmproxy/proxy/protocol/http_replay.py
+++ b/mitmproxy/proxy/protocol/http_replay.py
@@ -83,7 +83,11 @@ class RequestReplayThread(basethread.BaseThread):
 
                 server.wfile.write(http1.assemble_request(r))
                 server.wfile.flush()
+
+                if self.f.server_conn:
+                    self.f.server_conn.close()
                 self.f.server_conn = server
+
                 self.f.response = http.HTTPResponse.wrap(
                     http1.read_response(
                         server.rfile,