diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index 5122a5aa3..10101f0bd 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -38,6 +38,8 @@ if [ "$(uci -q get openvpn.omr.proto)" != "tcp-client" ]; then
 		set openvpn.omr.tls_client=1
 		set openvpn.omr.allow_recursive_routing=1
 		set openvpn.omr.comp_lzo=adaptive
+		set openvpn.omr.sndbuf=0
+		set openvpn.omr.rcvbuf=0
 		commit openvpn
 	EOF
 fi
@@ -46,6 +48,13 @@ if [ "$(uci -q get openvpn.omr.com_lzo)" = "" ]; then
 		set openvpn.omr.comp_lzo=adaptive
 	EOF
 fi
+if [ "$(uci -q get ipsec.ipsec.password)" = "myvpn" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set ipsec.ipsec.enabled='0'
+		commit ipsec
+	EOF
+	chmod u+x /etc/init.d/ipsec
+fi
 
 if [ "$(uci -q get dsvpn.vpn)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null