diff --git a/mode_s.c b/mode_s.c
index 87f02f3..1271d7d 100644
--- a/mode_s.c
+++ b/mode_s.c
@@ -422,6 +422,7 @@ int decodeModesMessage(struct modesMessage *mm, unsigned char *msg)
     mm->msgbits         = modesMessageLenByType(mm->msgtype);
     mm->crc             = modesChecksum(msg, mm->msgbits);
     mm->correctedbits   = 0;
+    mm->addr            = 0;
 
     // Do checksum work and set fields that depend on the CRC
     switch (mm->msgtype) {