diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index c7a80ca8e0..652b27476d 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -39,6 +39,7 @@
 #include "pim_rp.h"
 #include "pim_jp_agg.h"
 #include "pim_util.h"
+#include "pim_ssm.h"
 
 static void on_trace(const char *label, struct interface *ifp,
 		     struct in_addr src)
@@ -55,6 +56,7 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
 		      struct prefix_sg *sg, uint8_t source_flags)
 {
 	struct pim_interface *pim_ifp = NULL;
+	char buf[PREFIX_STRLEN];
 
 	if (PIM_DEBUG_PIM_TRACE) {
 		char up_str[INET_ADDRSTRLEN];
@@ -105,6 +107,14 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
 			return;
 		}
 
+		if (pim_is_grp_ssm(pim_ifp->pim, sg->grp)) {
+			zlog_warn(
+				"%s: Specified Group(%s) in join is now in SSM, not allowed to create PIM state",
+				__func__,
+				inet_ntop(AF_INET, &sg->grp, buf, sizeof(buf)));
+			return;
+		}
+
 		sg->src.s_addr = INADDR_ANY;
 	}
 
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 9d5b864ab0..fc464753e0 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -323,6 +323,7 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
 	int i_am_rp = 0;
 	struct pim_interface *pim_ifp = ifp->info;
 	struct pim_instance *pim = pim_ifp->pim;
+	char buf[PREFIX_STRLEN];
 
 #define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4
 	ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN);
@@ -381,6 +382,17 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
 			   pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp);
 	}
 
+	if (pim_is_grp_ssm(pim_ifp->pim, sg.grp)) {
+		if (sg.src.s_addr == INADDR_ANY) {
+			zlog_warn(
+				"%s: Received Register message for Group(%s) is now in SSM, dropping the packet",
+				__func__,
+				inet_ntop(AF_INET, &sg.grp, buf, sizeof(buf)));
+			/* Drop Packet Silently */
+			return 0;
+		}
+	}
+
 	if (i_am_rp
 	    && (dest_addr.s_addr
 		== ((RP(pim, sg.grp))->rpf_addr.u.prefix4.s_addr))) {
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 1da33af006..0ef0ad533e 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -548,6 +548,7 @@ void igmp_source_forward_reevaluate_all(struct pim_instance *pim)
 		struct pim_interface *pim_ifp = ifp->info;
 		struct listnode *grpnode;
 		struct igmp_group *grp;
+		struct pim_ifchannel *ch, *ch_temp;
 
 		if (!pim_ifp)
 			continue;
@@ -562,9 +563,17 @@ void igmp_source_forward_reevaluate_all(struct pim_instance *pim)
 			for (ALL_LIST_ELEMENTS_RO(grp->group_source_list,
 						  srcnode, src)) {
 				igmp_source_forward_reevaluate_one(pim, src);
-			}	  /* scan group sources */
-		}		  /* scan igmp groups */
-	}			  /* scan interfaces */
+			} /* scan group sources */
+		}	 /* scan igmp groups */
+
+		RB_FOREACH_SAFE (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb,
+				 ch_temp) {
+			if (pim_is_grp_ssm(pim, ch->sg.grp)) {
+				if (ch->sg.src.s_addr == INADDR_ANY)
+					pim_ifchannel_delete(ch);
+			}
+		}
+	} /* scan interfaces */
 }
 
 void igmp_source_forward_start(struct pim_instance *pim,