diff --git a/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua b/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
index 8291a50..5d285c2 100755
--- a/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
+++ b/mote/v2/openwrt/package/flukso/luasrc/fluksod.lua
@@ -52,8 +52,7 @@ local O_RDWR_CREAT	= nixio.open_flags('rdwr', 'creat')
 local POLLIN            = nixio.poll_flags('in')
 
 -- set WAN parameters
-local WAN_ENABLED	= true
-if tonumber(FLUKSO.daemon.enable_wan_branch) == 0 then WAN_ENABLED = false end
+local WAN_ENABLED	= (FLUKSO.daemon.enable_wan_branch == '1')
 
 local TIMESTAMP_MIN	= 1234567890
 local WAN_INTERVAL	= 300
@@ -78,8 +77,7 @@ local USER_AGENT        = 'Fluksometer v' .. FLUKSO_VERSION
 local CACERT		= FLUKSO.daemon.cacert
 
 -- set LAN parameters
-local LAN_ENABLED	= true
-if tonumber(FLUKSO.daemon.enable_lan_branch) == 0 then LAN_ENABLED = false end
+local LAN_ENABLED	= (FLUKSO.daemon.enable_lan_branch == '1')
 
 local LAN_POLISH_CUTOFF	= 60
 local LAN_PUBLISH_PATH	= DAEMON_PATH .. '/sensor'
diff --git a/mote/v2/openwrt/package/flukso/luasrc/heartbeat.lua b/mote/v2/openwrt/package/flukso/luasrc/heartbeat.lua
index e24d493..3fcbeb4 100755
--- a/mote/v2/openwrt/package/flukso/luasrc/heartbeat.lua
+++ b/mote/v2/openwrt/package/flukso/luasrc/heartbeat.lua
@@ -41,8 +41,7 @@ local httpclient = require 'luci.httpclient'
 local FLUKSO		= uci:get_all('flukso')
 
 -- WAN settings
-local WAN_ENABLED	= true
-if tonumber(FLUKSO.daemon.enable_wan_branch) == 0 then WAN_ENABLED = false end
+local WAN_ENABLED	= (FLUKSO.daemon.enable_wan_branch == '1')
 
 local WAN_BASE_URL	= FLUKSO.daemon.wan_base_url .. 'device/'
 local WAN_KEY		= '0123456789abcdef0123456789abcdef'