diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp
index 2db7aa8f5..1d663a7c3 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp
@@ -187,7 +187,19 @@ void PeerItem::updateItem()
 		statusLabel->setText(status);
 		trustLabel->setText(QString::fromStdString(RsPeerTrustString(details.trustLvl)));
 
-		ipLabel->setText(QString("%1:%2/%3:%4").arg(QString::fromStdString(details.localAddr)).arg(details.localPort).arg(QString::fromStdString(details.extAddr)).arg(details.extPort));
+        QString ip_string;
+
+        if(details.localPort != 0)
+            ip_string += QString("%1:%2").arg(QString::fromStdString(details.localAddr)).arg(details.localPort);
+
+        if(details.extPort != 0)
+        {
+            if(!ip_string.isNull())
+                ip_string += "/" ;
+
+            ip_string += ip_string += QString("%1:%2").arg(QString::fromStdString(details.extAddr)).arg(details.extPort);
+        }
+		ipLabel->setText(ip_string);
 
 		connLabel->setText(StatusDefs::connectStateString(details));