diff --git a/msg.c b/msg.c
index 06a3812..a38b815 100644
--- a/msg.c
+++ b/msg.c
@@ -42,7 +42,7 @@ struct message_storage {
 	struct ptp_message msg;
 } PACKED;
 
-static TAILQ_HEAD(msg_pool, ptp_message) msg_pool;
+static TAILQ_HEAD(msg_pool, ptp_message) msg_pool = TAILQ_HEAD_INITIALIZER(msg_pool);
 
 static struct {
 	int total;
diff --git a/port.c b/port.c
index 3f32433..93a79b1 100644
--- a/port.c
+++ b/port.c
@@ -376,6 +376,7 @@ static int add_foreign_master(struct port *p, struct ptp_message *m)
 			return 0;
 		}
 		memset(fc, 0, sizeof(*fc));
+		TAILQ_INIT(&fc->messages);
 		LIST_INSERT_HEAD(&p->foreign_masters, fc, list);
 		fc->port = p;
 		fc->dataset.sender = m->header.sourcePortIdentity;