diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 57d5f2387..474692015 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -349,14 +349,16 @@ function wizard_add()
 			ucic:set("sqm",intf,"qdisc","fq_codel")
 			ucic:set("sqm",intf,"script","simple.qos")
 			ucic:set("sqm",intf,"qdisc_advanced","0")
-			ucic:set("sqm",intf,"linklayer","none")
+			ucic:set("sqm",intf,"linklayer","atm")
+			ucic:set("sqm",intf,"overhead","40")
 			ucic:set("sqm",intf,"enabled","0")
 			ucic:set("sqm",intf,"debug_logging","0")
 			ucic:set("sqm",intf,"verbosity","5")
 			ucic:set("sqm",intf,"download","0")
 			ucic:set("sqm",intf,"upload","0")
-			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
-			ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
+			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress")
+			--ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
+			--ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
 		end
 
 		if downloadspeed ~= "0" and downloadspeed ~= "" then
@@ -379,8 +381,9 @@ function wizard_add()
 		end
 
 		if sqmenabled == "1" then
-			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
-			ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
+			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress")
+			--ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress dual-dsthost")
+			--ucic:set("sqm",intf,"eqdisc_opts","dual-srchost")
 			ucic:set("sqm",intf,"enabled","1")
 			ucic:set("qos",intf,"enabled","1")
 		else
diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
index f148a9916..d8c232752 100755
--- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
+++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
@@ -74,24 +74,24 @@ if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then
 	fi
 fi
 
-#if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
-#	uci -q batch <<-EOF >/dev/null
-#		set sqm.omrvpn=queue
-#		set sqm.omrvpn.qdisc="fq_codel"
-#		set sqm.omrvpn.script="simple.qos"
-#		set sqm.omrvpn.qdisc_advanced='0'
-#		set sqm.omrvpn.linklayer='none'
-#		set sqm.omrvpn.enabled='1'
-#		set sqm.omrvpn.interface=tun0
-#		set sqm.omrvpn.download='0'
-#		set sqm.omrvpn.upload='0'
-#		set sqm.omrvpn.debug_logging='0'
-#		set sqm.omrvpn.verbosity='5'
-#		set sqm.omrvpn.iqdisc_opts='autorate-ingress dual-dsthost'
-#		set sqm.omrvpn.eqdisc_opts='dual-srchost'
-#		commit sqm
-#	EOF
-#fi
+if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set sqm.omrvpn=queue
+		set sqm.omrvpn.qdisc="cake"
+		set sqm.omrvpn.script="piece_of_cake.qos"
+		set sqm.omrvpn.qdisc_advanced='0'
+		set sqm.omrvpn.linklayer='none'
+		set sqm.omrvpn.enabled='1'
+		set sqm.omrvpn.interface=tun0
+		set sqm.omrvpn.download='0'
+		set sqm.omrvpn.upload='0'
+		set sqm.omrvpn.debug_logging='0'
+		set sqm.omrvpn.verbosity='5'
+		set sqm.omrvpn.overhead='40'
+		set sqm.omrvpn.iqdisc_opts='autorate-ingress'
+		commit sqm
+	EOF
+fi
 
 rm -f /tmp/luci-indexcache