diff --git a/src/modules/module-avb/msrp.c b/src/modules/module-avb/msrp.c
index 92d1e65b4..40cb57268 100644
--- a/src/modules/module-avb/msrp.c
+++ b/src/modules/module-avb/msrp.c
@@ -332,7 +332,8 @@ static void msrp_notify(void *data, uint64_t now, uint8_t notify)
 {
 	struct attr *a = data;
 	struct msrp *msrp = a->msrp;
-	return dispatch[a->attr.type].notify(msrp, now, a, notify);
+	if (dispatch[a->attr.type].notify)
+		dispatch[a->attr.type].notify(msrp, now, a, notify);
 }
 
 static const struct avb_mrp_attribute_events mrp_attr_events = {
diff --git a/src/modules/module-avb/mvrp.c b/src/modules/module-avb/mvrp.c
index 20862c2ae..e2667ce40 100644
--- a/src/modules/module-avb/mvrp.c
+++ b/src/modules/module-avb/mvrp.c
@@ -171,7 +171,8 @@ static void mvrp_notify(void *data, uint64_t now, uint8_t notify)
 {
 	struct attr *a = data;
 	struct mvrp *mvrp = a->mvrp;
-	return dispatch[a->attr.type].notify(mvrp, now, a, notify);
+	if (dispatch[a->attr.type].notify)
+		dispatch[a->attr.type].notify(mvrp, now, a, notify);
 }
 
 static const struct avb_mrp_attribute_events mrp_attr_events = {