diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs
index 29f877821..8eed1b862 100644
--- a/BTCPayServer/Controllers/WalletsController.cs
+++ b/BTCPayServer/Controllers/WalletsController.cs
@@ -782,6 +782,12 @@ namespace BTCPayServer.Controllers
                 }
             };
             AddSigningContext(redirectVm, vm.SigningContext);
+            if (!string.IsNullOrEmpty(vm.SigningContext.OriginalPSBT) &&
+                !string.IsNullOrEmpty(vm.SigningContext.PSBT))
+            {
+                //if a hw device signed a payjoin, we want it broadcast instantly
+                redirectVm.Parameters.Add(new KeyValuePair<string, string>("command", "broadcast"));  
+            }
             return View("PostRedirect", redirectVm);
         }
 
diff --git a/BTCPayServer/Views/Wallets/SigningContext.cshtml b/BTCPayServer/Views/Wallets/SigningContext.cshtml
index 6d69ee6d1..9e7d97e10 100644
--- a/BTCPayServer/Views/Wallets/SigningContext.cshtml
+++ b/BTCPayServer/Views/Wallets/SigningContext.cshtml
@@ -2,9 +2,9 @@
 
 @if (Model != null)
 {
-    <input type="hidden" asp-for="PSBT" />
-    <input type="hidden" asp-for="OriginalPSBT" />
-    <input type="hidden" asp-for="PayJoinBIP21" />
-    <input type="hidden" asp-for="EnforceLowR" />
-    <input type="hidden" asp-for="ChangeAddress" />
+    <input type="hidden" asp-for="PSBT" value="@Model.PSBT"/>
+    <input type="hidden" asp-for="OriginalPSBT" value="@Model.OriginalPSBT"/>
+    <input type="hidden" asp-for="PayJoinBIP21" value="@Model.PayJoinBIP21"/>
+    <input type="hidden" asp-for="EnforceLowR" value="@Model.EnforceLowR" />
+    <input type="hidden" asp-for="ChangeAddress"  value="@Model.ChangeAddress" />
 }