diff --git a/src/blindpsbt.cpp b/src/blindpsbt.cpp
index 358ac9103f..a1b21e5dd0 100644
--- a/src/blindpsbt.cpp
+++ b/src/blindpsbt.cpp
@@ -476,6 +476,9 @@ BlindingStatus BlindPSBT(PartiallySignedTransaction& psbt, std::map<uint32_t, st
                         }
                     }
                 }
+                else {
+                    input_asset_blinders.emplace_back();
+                }
             }
         }
     }
diff --git a/src/psbt.cpp b/src/psbt.cpp
index f0ec757a34..f598e5706b 100644
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -123,13 +123,26 @@ CMutableTransaction PartiallySignedTransaction::GetUnsignedTx(bool force_unblind
         txin.nSequence = input.sequence.value_or(max_sequence);
         txin.assetIssuance.assetBlindingNonce = input.m_issuance_blinding_nonce;
         txin.assetIssuance.assetEntropy = input.m_issuance_asset_entropy;
-        if (input.m_issuance_value != std::nullopt && input.m_issuance_inflation_keys_amount != std::nullopt && force_unblinded) {
+        // If there is a commitment we should set the value to the commitment unless we are forcing unblinded.
+        // If we are forcing unblinded but there is no value, we just use the commitment.
+        if (input.m_issuance_value != std::nullopt && (input.m_issuance_value_commitment.IsNull() || force_unblinded)) {
             txin.assetIssuance.nAmount.SetToAmount(*input.m_issuance_value);
-            txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_inflation_keys_amount);
-        } else {
+        }
+        else if(!input.m_issuance_value_commitment.IsNull()) {
             txin.assetIssuance.nAmount = input.m_issuance_value_commitment;
+        }
+        else {
+            txin.assetIssuance.nAmount.SetNull();
+        }
+        if (input.m_issuance_inflation_keys_amount != std::nullopt && (input.m_issuance_inflation_keys_commitment.IsNull() || force_unblinded)) {
+            txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_value);
+        }
+        else if(!input.m_issuance_inflation_keys_commitment.IsNull()) {
             txin.assetIssuance.nInflationKeys = input.m_issuance_inflation_keys_commitment;
         }
+        else {
+            txin.assetIssuance.nInflationKeys.SetNull();
+        }
         mtx.vin.push_back(txin);
     }
     for (const PSBTOutput& output : outputs) {
@@ -531,12 +544,9 @@ bool PSBTOutput::Merge(const PSBTOutput& output)
 CTxOut PSBTOutput::GetTxOut() const
 {
     assert(script != std::nullopt);
-    if (!m_value_commitment.IsNull() && !m_asset_commitment.IsNull()) {
-        return CTxOut(m_asset_commitment, m_value_commitment, *script);
-    }
-    assert(amount != std::nullopt);
-    assert(!m_asset.IsNull());
-    return CTxOut(CConfidentialAsset(CAsset(m_asset)), CConfidentialValue(*amount), *script);
+    assert(amount != std::nullopt || !m_value_commitment.IsNull());
+    assert(!m_asset.IsNull() || !m_asset_commitment.IsNull());
+    return CTxOut(!m_asset_commitment.IsNull() ? m_asset_commitment : CAsset(m_asset), !m_value_commitment.IsNull() ? m_value_commitment : CConfidentialValue(*amount), *script);
 }
 
 bool PSBTOutput::IsBlinded() const
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6366e5e213..47e936274c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2048,11 +2048,15 @@ TransactionError CWallet::SignPSBT(PartiallySignedTransaction& psbtx, bool& comp
             txin.assetIssuance.nAmount = input.m_issuance_value_commitment;
         } else if (input.m_issuance_value) {
             txin.assetIssuance.nAmount.SetToAmount(*input.m_issuance_value);
+        } else {
+            txin.assetIssuance.nAmount.SetNull();
         }
         if (!input.m_issuance_inflation_keys_commitment.IsNull()) {
             txin.assetIssuance.nInflationKeys = input.m_issuance_inflation_keys_commitment;
         } else if (input.m_issuance_inflation_keys_amount) {
             txin.assetIssuance.nInflationKeys.SetToAmount(*input.m_issuance_inflation_keys_amount);
+        } else {
+            txin.assetIssuance.nInflationKeys.SetNull();
         }
         if (!input.m_issuance_rangeproof.empty()) {
             txinwit.vchIssuanceAmountRangeproof = input.m_issuance_rangeproof;