diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs b/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs
index 1eb7869a3..ed5e971e7 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs
@@ -159,8 +159,8 @@ namespace BTCPayServer.Payments.Bitcoin
 
             onchainMethod.DepositAddress = (await prepare.ReserveAddress).Address.ToString();
             onchainMethod.PayjoinEnabled = blob.PayJoinEnabled &&
-                                           supportedPaymentMethod.AccountDerivation.ScriptPubKeyType() ==
-                                           ScriptPubKeyType.Segwit &&
+                                           PayjoinClient.SupportedFormats.Contains(supportedPaymentMethod
+                                               .AccountDerivation.ScriptPubKeyType()) &&
                                            network.SupportPayJoin;
             if (onchainMethod.PayjoinEnabled)
             {