diff --git a/AUTHORS.md b/AUTHORS.md
index 63d18521f..a532b9606 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -44,6 +44,7 @@ Contributors to LibreNMS:
 - Mikhail Bratchikov <mbratchikov@odin.com> (pepyaka)
 - Aaron Daniels <aaron@daniels.id.au> (adaniels21487)
 - David M. Syzdek <david@syzdek.net> (syzdek)
+- Gerben Meijer <gerben@daybyday.nl> (infernix)
 
 [1]: http://observium.org/ "Observium web site"
 
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index ae318153b..321f4b69f 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -352,8 +352,9 @@ foreach ($ports as $port) {
             }
         }//end foreach
 
-        if (($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) && $config['os'][$os]['ifalias_null'] == 1) {
+        if (($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) && $config['os'][$device['os']]['ifalias_null'] == 1) {
             $port['update']['ifAlias'] = $port['ifDescr'];
+            $this_port['ifAlias'] = $port['ifDescr'];
             d_echo('Using ifDescr due to ifAlias being NULL');
         }