diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
index 85c21ac4..4658b419 100755
--- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
+++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
@@ -8,6 +8,7 @@ local site = require 'gluon.site'
 local sysconfig = require 'gluon.sysconfig'
 local util = require 'gluon.util'
 local uci = require('simple-uci').cursor()
+local next_node = site.next_node({})
 
 
 uci:section('network', 'interface', 'client', {
@@ -26,11 +27,17 @@ uci:delete('network', 'client_lan')
 
 uci:delete('network', 'local_node_route')
 
+uci:section('network', 'rule6', 'local_node_rule6', {
+	src = next_node.ip6 .. '/128',
+	lookup = 2,
+})
+uci:set('network', 'local_node_rule6', 'in', 'loopback')
+
 uci:delete('network', 'local_node_route6')
 uci:section('network', 'route6', 'local_node_route6', {
-	interface = 'client',
+	interface = 'local_node',
 	target = site.prefix6(),
-	gateway = '::',
+	table = 2,
 })
 
 uci:save('network')