diff --git a/qosmngr/Makefile b/qosmngr/Makefile
index b34db44d2..6c8161d58 100644
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b20ead8c752f7ccba1532340de9a0864b6ae4ea8
+PKG_SOURCE_VERSION:=4179d88a94d8d5989c67504228f9d61ec8a57aac
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
diff --git a/qosmngr/files/common/etc/uci-defaults/60-qos_config_generate b/qosmngr/files/common/etc/uci-defaults/60-qos_config_generate
index 728e943a8..afd4396a1 100644
--- a/qosmngr/files/common/etc/uci-defaults/60-qos_config_generate
+++ b/qosmngr/files/common/etc/uci-defaults/60-qos_config_generate
@@ -78,9 +78,15 @@ json_init
 json_load_file /etc/board.json
 json_select network
 json_select lan
-json_for_each_item "generate_lan_queues" "ports"
+if json_is_a ports array; then
+	json_for_each_item "generate_lan_queues" "ports"
+else
+	json_get_var lan_device device
+	[ -n "$lan_device" ] && generate_lan_queues "$lan_device"
+fi
 
 json_select ..
-json_select wan
+json_select wan 2>/dev/null
 json_get_var wan_port device
-generate_wan_queues "$wan_port"
+[ -n "$wan_port" ] && generate_wan_queues "$wan_port"
+json_cleanup