diff --git a/src/torrent.cpp b/src/torrent.cpp
index ae40ee9d4..70c310e1b 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -3424,6 +3424,7 @@ namespace libtorrent
 	void torrent::resolve_peer_country(boost::intrusive_ptr<peer_connection> const& p) const
 	{
 		if (m_resolving_country
+			|| is_local(p->remote().address())
 			|| p->has_country()
 			|| p->is_connecting()
 			|| p->is_queued()