diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index 7bca388d9..6478c544a 100644
--- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -193,6 +193,8 @@ o:value("trojan", translate("Trojan"))
 o:value("shadowsocks", translate("Shadowsocks"))
 if is_installed("sagernet-core") then
 	o:value("shadowsocksr", translate("ShadowsocksR"))
+end
+if is_finded("xray") then
 	o:value("wireguard", translate("WireGuard"))
 end
 o:value("socks", translate("Socks"))
@@ -604,6 +606,7 @@ o.rmempty = true
 
 -- [[ WireGuard 部分 ]]--
 o = s:option(DynamicList, "local_addresses", translate("Local addresses"))
+o.datatype = "cidr"
 o:depends({type = "v2ray", v2ray_protocol = "wireguard"})
 o.rmempty = true
 
@@ -657,7 +660,7 @@ if is_finded("xray") then
 		o:value(v, translate(v))
 	end
 	o.rmempty = true
-	o:depends({type = "v2ray", v2ray_protocol = "vless", tls = true})
+	o:depends({type = "v2ray", v2ray_protocol = "vless", transport = "tcp", tls = true})
 end
 
 -- [[ TLS部分 ]] --
diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
index 17765a55b..bcec9a05b 100755
--- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
+++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
@@ -76,13 +76,16 @@ function socks_http()
 end
 function wireguard()
 	outbound_settings = {
-		address = server.server,
-		port = tonumber(server.server_port),
-		localAddresses = server.local_addresses,
-		privateKey = server.private_key,
-		peerPublicKey = server.peer_pubkey,
-		preSharedKey = server.preshared_key or nil,
-		mtu = tonumber(server.mtu) or 1500
+		secretKey = server.private_key,
+		address = server.local_addresses,
+		peers = {
+			{
+				publicKey = server.peer_pubkey,
+				preSharedKey = server.preshared_key,
+				endpoint = server.server .. ":" .. server.server_port
+			}
+		},
+		mtu = tonumber(server.mtu)
 	}
 end
 local outbound = {}