diff --git a/track.c b/track.c
index 9fa626a..b550e97 100644
--- a/track.c
+++ b/track.c
@@ -814,6 +814,11 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm)
         return NULL;
     }
 
+    if (mm->addr == 0) {
+        // junk address, don't track it
+        return NULL;
+    }
+
     _messageNow = mm->sysTimestampMsg;
 
     // Lookup our aircraft or create a new one