diff --git a/includes/discovery/os/vyos.inc.php b/includes/discovery/os/vyos.inc.php
index 5c0812121..8082cf93a 100644
--- a/includes/discovery/os/vyos.inc.php
+++ b/includes/discovery/os/vyos.inc.php
@@ -2,7 +2,6 @@
 
 if (!$os || $os == "vyatta") {
     if (preg_match("/^Vyatta VyOS/", $sysDescr) || preg_match("/^VyOS/", $sysDescr)) {
-	$sysDescr = "VyOS";
 	$os = "vyos";
     }
 }
diff --git a/includes/polling/os/vyos.inc.php b/includes/polling/os/vyos.inc.php
index ae54d1c3d..57ae2b5bf 100644
--- a/includes/polling/os/vyos.inc.php
+++ b/includes/polling/os/vyos.inc.php
@@ -1,5 +1,7 @@
 <?php
 
-list($features, $version) = explode("-", trim(str_replace("VyOS", "", snmp_get($device, "SNMPv2-MIB::sysDescr.0", "-Oqv", "SNMPv2-MIB"))), 2);
+str_replace("Vyatta", "", $poll_device['sysDescr']);
+list(,$version) = explode(" ", $poll_device['sysDescr'], 2);
+$features = "";
 
 ?>