diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 9c03069b5..d61c68702 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1319,7 +1319,7 @@ namespace aux {
 
 #ifdef TORRENT_USE_OPENSSL
 		// SSL torrents use the SSL listen port
-		if (req.ssl_ctx) req.listen_port = ssl_listen_port();
+		if (req.ssl_ctx && req.ssl_ctx != &m_ssl_ctx) req.listen_port = ssl_listen_port();
 		else req.ssl_ctx = &m_ssl_ctx;
 #endif
 #if TORRENT_USE_I2P
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 1f88ae49f..fc6f18aef 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -3722,9 +3722,6 @@ namespace {
 
 				req.private_torrent = m_torrent_file->priv();
 				req.second_announce = true;
-#ifdef TORRENT_USE_OPENSSL
-				req.ssl_ctx = NULL;
-#endif
 
 				// tell the tracker to bind to the opposite protocol type
 				req.bind_ip = tracker_ip.is_v4()