diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 129d569c87..8f6a9ece53 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -1012,10 +1012,21 @@ int pim_ifchannel_local_membership_add(struct interface *ifp,
 
 	/* PIM enabled on interface? */
 	pim_ifp = ifp->info;
-	if (!pim_ifp)
+	if (!pim_ifp) {
+		if (PIM_DEBUG_EVENTS)
+			zlog_debug("%s:%s Expected pim interface setup for %s",
+				   __PRETTY_FUNCTION__,
+				   pim_str_sg_dump(sg), ifp->name);
 		return 0;
-	if (!PIM_IF_TEST_PIM(pim_ifp->options))
+	}
+
+	if (!PIM_IF_TEST_PIM(pim_ifp->options)) {
+		if (PIM_DEBUG_EVENTS)
+			zlog_debug("%s:%s PIM is not configured on this interface %s",
+				   __PRETTY_FUNCTION__,
+				   pim_str_sg_dump(sg), ifp->name);
 		return 0;
+	}
 
 	pim = pim_ifp->pim;
 
@@ -1033,6 +1044,10 @@ int pim_ifchannel_local_membership_add(struct interface *ifp,
 
 	ch = pim_ifchannel_add(ifp, sg, 0, PIM_UPSTREAM_FLAG_MASK_SRC_IGMP);
 	if (!ch) {
+		if (PIM_DEBUG_EVENTS)
+			zlog_debug("%s:%s Unable to add ifchannel",
+				   __PRETTY_FUNCTION__,
+				   pim_str_sg_dump(sg));
 		return 0;
 	}
 
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 3dfc36a0c2..10ea17cf1f 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -1048,6 +1048,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
 				   __PRETTY_FUNCTION__,
 				   pim_str_sg_dump(&sg),
 				   group->group_igmp_sock->interface->name);
+
+		pim_channel_del_oif(source->source_channel_oil,
+				    group->group_igmp_sock->interface,
+				    PIM_OIF_FLAG_PROTO_IGMP);
 		return;
 	}
 	/*
@@ -1059,6 +1063,10 @@ void igmp_source_forward_start(struct pim_instance *pim,
 		if (PIM_DEBUG_MROUTE)
 			zlog_warn("%s: Failure to add local membership for %s",
 				  __PRETTY_FUNCTION__, pim_str_sg_dump(&sg));
+
+		pim_channel_del_oif(source->source_channel_oil,
+				    group->group_igmp_sock->interface,
+				    PIM_OIF_FLAG_PROTO_IGMP);
 		return;
 	}