diff --git a/service/xboard/service.go b/service/xboard/service.go
index 81d430aa..d1456de0 100644
--- a/service/xboard/service.go
+++ b/service/xboard/service.go
@@ -626,9 +626,8 @@ func (s *Service) setupNode() error {
 		}
 
 		if strings.Contains(method, "2022") {
-			// SS2022: server_key must be Base64-encoded to match client URI
-			keyLen := ss2022KeyLength(method)
-			ssOptions.Password = ss2022Key(serverKey, keyLen)
+			// SS2022: server_key is ALREADY Base64 from panel (Double-wrapping fixed)
+			ssOptions.Password = serverKey
 
 			s.logger.Info("Xboard SS2022 setup. Method: ", method, " Master_PSK: ", ssOptions.Password)
 		} else {