diff --git a/bsp/default/root_file_system/etc/config/batman-adv b/bsp/default/root_file_system/etc/config/batman-adv
index 6af23c4e..db694fe8 100644
--- a/bsp/default/root_file_system/etc/config/batman-adv
+++ b/bsp/default/root_file_system/etc/config/batman-adv
@@ -4,8 +4,8 @@ config 'mesh' 'bat0'
         option 'bonding'          
         option 'fragmentation'    
         option 'gw_bandwidth'     
-        option 'gw_mode'          
-        option 'gw_sel_class'     
+        option 'gw_mode' 'client'
+        option 'gw_sel_class' '1'
         option 'log_level'              
         option 'orig_interval'               
         option 'vis_mode'