diff --git a/bip-0078.mediawiki b/bip-0078.mediawiki
index 6a008584..bf75ddfa 100644
--- a/bip-0078.mediawiki
+++ b/bip-0078.mediawiki
@@ -424,6 +424,7 @@ public async Task<PSBT> RequestPayjoin(
     for (int i = 0; i < originalGlobalTx.Outputs.Count; i++)
     {
         if (optionalParameters.DisableOutputSubstitution ||
+            bip21.Address == null ||
             signedPSBT.Outputs[i].ScriptPubKey != bip21.Address.ScriptPubKey)
             ourOutputs.Enqueue((originalGlobalTx.Outputs[i], signedPSBT.Outputs[i]));
     }