diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index d2f3c2323..8a7cb8069 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -1189,10 +1189,13 @@ function load_mibdefs($module, $name)
 
     // add shortname to each element
     $prefix = longest_matching_prefix($name, $object_types);
-    if (strlen($prefix) > 2) {
-        foreach ($result as $mib => $m) {
+    foreach ($result as $mib => $m) {
+        if (strlen($prefix) > 2) {
             $result[$mib]['shortname'] = preg_replace("/^$prefix/", '', $m['object_type'], 1);
         }
+        else {
+            $result[$mib]['shortname'] = $m['object_type'];
+        }
     }
 
     d_print_r($result);