diff --git a/includes/polling/device-catos.inc.php b/includes/polling/device-catos.inc.php
index a898279e3..f2793bc10 100755
--- a/includes/polling/device-catos.inc.php
+++ b/includes/polling/device-catos.inc.php
@@ -47,7 +47,6 @@
 
    `rrdtool update $cpurrd N:$cpu5s:$cpu5m`;
 
-   include("includes/polling/bgpPeer.inc.php");
    include("includes/polling/cisco-processors.inc.php");
    include("includes/polling/cisco-mempool.inc.php");
    include("includes/polling/cisco-entity-sensors.inc.php");
diff --git a/includes/polling/device-ios.inc.php b/includes/polling/device-ios.inc.php
index fe69adcd0..c7434571f 100755
--- a/includes/polling/device-ios.inc.php
+++ b/includes/polling/device-ios.inc.php
@@ -87,7 +87,6 @@
    }
    rrdtool_update ($memrrd, "N:$memfreeio:$memusedio:$memfreeproc:$memusedproc:$memtotal");
 
-   include("includes/polling/bgpPeer.inc.php");
    include("includes/polling/cisco-processors.inc.php");
    include("includes/polling/cisco-enhanced-mempool.inc.php");
    include("includes/polling/cisco-mempool.inc.php");
diff --git a/poll-device.php b/poll-device.php
index 1981e8490..5741fbadf 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -106,6 +106,7 @@ while ($device = mysql_fetch_array($device_query)) {
     include("includes/polling/ipSystemStats.inc.php");
     include("includes/polling/ports.inc.php");
     include("includes/polling/cisco-mac-accounting.inc.php");
+    include("includes/polling/bgpPeer.inc.php");
 
   unset( $update ) ;
   unset( $seperator) ;