2 files changed, 4 insertions, 0 deletions
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index 68f635d18..86a117405 100644
--- a/src/blockchain_db/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -91,6 +91,8 @@ void BlockchainDB::add_transaction(const crypto::hash& blk_hash, const transacti
   for (uint64_t i = 0; i < tx.vout.size(); ++i)
   {
     amount_output_indices.push_back(add_output(tx_hash, tx.vout[i], i, tx.unlock_time));
+    if (tx.version > 1 && tx.vout[i].amount == 0)
+      add_rct_commitment(tx.rct_signatures.outPk[i].mask);
   }
   add_tx_amount_output_indices(tx_id, amount_output_indices);
 }
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index ba9ee8d9e..887740e06 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -861,6 +861,8 @@ void BlockchainLMDB::remove_tx_outputs(const uint64_t tx_id, const transaction&
   {
     const tx_out tx_output = tx.vout[i-1];
     remove_output(tx_output.amount, amount_output_indices[i-1]);
+    if (tx_output.amount == 0)
+      remove_rct_commitment(amount_output_indices[i-1]);
   }
 }