diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
index 10b6717132f9595729c7de42ad70b2e3238b83b9..b6b1657468731ec8314a11c599ee69389894c98c 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
@@ -3,7 +3,11 @@
 local uci = require('luci.model.uci').cursor()
 
 if uci:get('system', 'rssid_wlan0') then
-  uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
+  if uci:get('wireless', 'mesh_radio0') then
+    uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
+  else
+    uci:set('system', 'rssid_wlan0', 'dev', 'ibss0')
+  end
 
   uci:save('system')
 end