diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 0a780e16d..4d698ee09 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -464,11 +464,9 @@ if ($tor_reged && $tor_info) {
 
                     $peerCountry = $lang['UNKNOWN'];
                     if (IS_AM || $peer['user_id'] == $userdata['user_id'] || !bf($peer['user_opt'], 'user_opt', 'user_hide_peer_country')) {
-                        if ($port !== false && $ip !== false) {
-                            if ($infoByIP = infoByIP($ip, $port)) {
-                                if (isset($infoByIP['countryCode'])) {
-                                    $peerCountry = render_flag($infoByIP['countryCode']);
-                                }
+                        if ($infoByIP = infoByIP((!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']), $peer['port'])) {
+                            if (isset($infoByIP['countryCode'])) {
+                                $peerCountry = render_flag($infoByIP['countryCode']);
                             }
                         }
                     }