diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
index ca29e9ac..2f34c9fd 100755
--- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
+++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
@@ -34,6 +34,8 @@ uci:section('network', 'interface', 'client', {
 	auto = true,
 	ipv6 = false,
 	macaddr = sysconfig.primary_mac,
+	igmp_snooping = true,
+	multicast_querier = true,
 })
 
 uci:save('network')
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/110-network b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
index 72a9a7eb..6ca0dc84 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
@@ -9,12 +9,12 @@ uci:section('network', 'interface', 'wan',
 	    {
 	      ifname = sysconfig.wan_ifname,
 	      type = 'bridge',
+	      igmp_snooping = true,
 	      multicast_querier = false,
 	      peerdns = false,
 	      auto = true,
 	    }
 )
-uci:delete('network', 'wan', 'igmp_snooping')
 
 if not uci:get('network', 'wan', 'proto') then
   uci:set('network', 'wan', 'proto', 'dhcp')