diff --git a/src/if.c b/src/if.c
index 755329f..c8420e5 100644
--- a/src/if.c
+++ b/src/if.c
@@ -281,7 +281,7 @@ int patty_ax25_if_addr_match(patty_ax25_if *iface,
 
     item = iface->aliases->first;
 
-    while ((item = item->next) != NULL) {
+    while (item) {
         patty_ax25_addr *alias = item->value;
 
         if (memcmp(&alias->callsign,
@@ -289,6 +289,8 @@ int patty_ax25_if_addr_match(patty_ax25_if *iface,
                    sizeof(addr->callsign)) == 0) {
             return 1;
         }
+
+        item = item->next;
     }
 
     return 0;