diff --git a/src/modules/module-avb/mrp.c b/src/modules/module-avb/mrp.c
index 73d5275ca..c6505d41b 100644
--- a/src/modules/module-avb/mrp.c
+++ b/src/modules/module-avb/mrp.c
@@ -302,6 +302,8 @@ const char *avb_mrp_notify_name(uint8_t notify)
 const char *avb_mrp_send_name(uint8_t send)
 {
 	switch(send) {
+	case 0:
+		return "none";
 	case AVB_MRP_SEND_NEW:
 		return "new";
 	case AVB_MRP_SEND_JOININ:
diff --git a/src/modules/module-avb/mrp.h b/src/modules/module-avb/mrp.h
index 78683412c..399343267 100644
--- a/src/modules/module-avb/mrp.h
+++ b/src/modules/module-avb/mrp.h
@@ -88,13 +88,13 @@ struct avb_packet_mrp_footer {
 #define AVB_MRP_ATTRIBUTE_EVENT_LV	5
 #define AVB_MRP_ATTRIBUTE_EVENT_LVA	6
 
-#define AVB_MRP_SEND_NEW		0
-#define AVB_MRP_SEND_JOININ		1
-#define AVB_MRP_SEND_IN		2
-#define AVB_MRP_SEND_JOINMT		3
-#define AVB_MRP_SEND_MT		4
-#define AVB_MRP_SEND_LV		5
-#define AVB_MRP_SEND_LVA		6
+#define AVB_MRP_SEND_NEW		1
+#define AVB_MRP_SEND_JOININ		2
+#define AVB_MRP_SEND_IN		3
+#define AVB_MRP_SEND_JOINMT		4
+#define AVB_MRP_SEND_MT		5
+#define AVB_MRP_SEND_LV		6
+#define AVB_MRP_SEND_LVA		7
 
 #define AVB_MRP_NOTIFY_NEW		1
 #define AVB_MRP_NOTIFY_JOIN		2
diff --git a/src/modules/module-avb/msrp.c b/src/modules/module-avb/msrp.c
index 40cb57268..611ddd537 100644
--- a/src/modules/module-avb/msrp.c
+++ b/src/modules/module-avb/msrp.c
@@ -91,7 +91,7 @@ static int encode_talker(struct msrp *msrp, struct attr *a, void *m)
 	*t = a->attr.attr.talker;
 
 	ev = SPA_PTROFF(t, sizeof(*t), uint8_t);
-	*ev = a->attr.mrp->pending_send * 6 * 6;
+	*ev = (a->attr.mrp->pending_send - 1) * 6 * 6;
 
 	f = SPA_PTROFF(ev, sizeof(*ev), struct avb_packet_mrp_footer);
 	f->end_mark = 0;
@@ -170,7 +170,7 @@ static int encode_listener(struct msrp *msrp, struct attr *a, void *m)
 	*l = a->attr.attr.listener;
 
 	ev = SPA_PTROFF(l, sizeof(*l), uint8_t);
-	*ev = a->attr.mrp->pending_send * 6 * 6;
+	*ev = (a->attr.mrp->pending_send - 1) * 6 * 6;
 
 	ev = SPA_PTROFF(ev, sizeof(*ev), uint8_t);
 	*ev = a->attr.param * 4 * 4 * 4;
@@ -226,7 +226,7 @@ static int encode_domain(struct msrp *msrp, struct attr *a, void *m)
 	*d = a->attr.attr.domain;
 
 	ev = SPA_PTROFF(d, sizeof(*d), uint8_t);
-	*ev = a->attr.mrp->pending_send * 36;
+	*ev = (a->attr.mrp->pending_send - 1) * 36;
 
 	f = SPA_PTROFF(ev, sizeof(*ev), struct avb_packet_mrp_footer);
 	f->end_mark = 0;
diff --git a/src/modules/module-avb/mvrp.c b/src/modules/module-avb/mvrp.c
index e2667ce40..e2e501a9e 100644
--- a/src/modules/module-avb/mvrp.c
+++ b/src/modules/module-avb/mvrp.c
@@ -84,7 +84,7 @@ static int encode_vid(struct mvrp *mvrp, struct attr *a, void *m)
 	*d = a->attr.attr.vid;
 
 	ev = SPA_PTROFF(d, sizeof(*d), uint8_t);
-	*ev = a->attr.mrp->pending_send * 36;
+	*ev = (a->attr.mrp->pending_send - 1) * 36;
 
 	f = SPA_PTROFF(ev, sizeof(*ev), struct avb_packet_mrp_footer);
 	f->end_mark = 0;