diff --git a/mcastmngr/files/linux/lib/mcast/linux.sh b/mcastmngr/files/linux/lib/mcast/linux.sh
index 5363c5e1e..3dfa7411e 100755
--- a/mcastmngr/files/linux/lib/mcast/linux.sh
+++ b/mcastmngr/files/linux/lib/mcast/linux.sh
@@ -395,13 +395,15 @@ config_mcproxy() {
 	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
-	elif [ "$igmp_s_enable" == "1" ]; then
+	fi
+	if [ "$igmp_s_enable" == "1" ]; then
 		config_snooping igmp "$igmp_s_version"
 	fi
 
 	if [ "$mld_p_enable" == "1" ]; then
 		config_mcproxy_instance mld "$mld_p_version"
-	elif [ "$mld_s_enable" == "1" ]; then
+	fi
+	if [ "$mld_s_enable" == "1" ]; then
 		config_snooping mld "$mld_s_version"
 	fi
 }