diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php
index 8fbd592e2b..4d8d9f6047 100644
--- a/includes/discovery/bgp-peers.inc.php
+++ b/includes/discovery/bgp-peers.inc.php
@@ -81,6 +81,9 @@ if (Config::get('enable_bgp')) {
                 if ($device['os'] == 'junos') {
                     $safis[1] = 'unicast';
                     $safis[2] = 'multicast';
+                    $safis[3] = 'unicastAndMulticast';
+                    $safis[4] = 'labeledUnicast';
+                    $safis[128] = 'vpn';
 
                     if (!isset($j_peerIndexes)) {
                         $j_bgp = snmpwalk_cache_multi_oid($device, 'jnxBgpM2PeerEntry', $jbgp, 'BGP4-V2-MIB-JUNIPER', 'junos');