diff --git a/xpra/net/crypto.py b/xpra/net/crypto.py
index fba78c0fab..32c08393a7 100644
--- a/xpra/net/crypto.py
+++ b/xpra/net/crypto.py
@@ -40,8 +40,8 @@
 PADDING_LEGACY = "legacy"
 PADDING_PKCS7 = "PKCS#7"
 ALL_PADDING_OPTIONS = (PADDING_LEGACY, PADDING_PKCS7)
-INITIAL_PADDING = os.environ.get("XPRA_CRYPTO_INITIAL_PADDING", PADDING_LEGACY)
-DEFAULT_PADDING = PADDING_LEGACY
+INITIAL_PADDING = os.environ.get("XPRA_CRYPTO_INITIAL_PADDING", PADDING_PKCS7)
+DEFAULT_PADDING = PADDING_PKCS7
 PREFERRED_PADDING = os.environ.get("XPRA_CRYPTO_PREFERRED_PADDING", PADDING_PKCS7)
 if PREFERRED_PADDING not in ALL_PADDING_OPTIONS:
     raise ValueError(f"invalid preferred padding: {PREFERRED_PADDING}")