diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php
index 7bd17860c..fda5d553c 100644
--- a/includes/polling/bgp-peers.inc.php
+++ b/includes/polling/bgp-peers.inc.php
@@ -13,7 +13,8 @@ if ($config['enable_bgp'])
       $peer2 = FALSE;
     echo("Checking BGP peer ".$peer['bgpPeerIdentifier']." ");
 
-    if (!empty($peer['bgpPeerIdentifier']) && $device['os'] != "junos")
+    if( !empty($peer['bgpPeerIdentifier']) ) {
+    if( !strstr($peer['bgpPeerIdentifier'],':') || $device['os'] != "junos" )
     {
       # v4 BGP4 MIB
       // FIXME - needs moved to function
@@ -129,6 +130,7 @@ if ($config['enable_bgp'])
         $bgpLocalAddr = Net_IPv6::compress(implode(':',$bgpLocalAddr6)); unset($bgpLocalAddr6);
       }
     }
+    }
 
     if ($bgpPeerFsmEstablishedTime)
     {