diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 8763a1b24..4b8edadc1 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2471,7 +2471,7 @@ bool Blockchain::get_output_distribution(uint64_t amount, uint64_t from_height,
     {
       case STAGENET: start_height = stagenet_hard_forks[3].height; break;
       case TESTNET: start_height = testnet_hard_forks[3].height; break;
-      case MAINNET: start_height = mainnet_hard_forks[3].height; break;
+      case MAINNET: start_height = 0; break;
       case FAKECHAIN: start_height = 0; break;
       default: return false;
     }
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 30b3502dc..eb9b1ef9d 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -8799,8 +8799,8 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
       // check we're clear enough of rct start, to avoid corner cases below
       THROW_WALLET_EXCEPTION_IF(rct_offsets.size() <= CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE,
           error::get_output_distribution, "Not enough rct outputs");
-      //THROW_WALLET_EXCEPTION_IF(rct_offsets.back() <= max_rct_index,
-          //error::get_output_distribution, "Daemon reports suspicious number of rct outputs");
+      THROW_WALLET_EXCEPTION_IF(rct_offsets.back() <= max_rct_index,
+          error::get_output_distribution, "Daemon reports suspicious number of rct outputs");
     }
 
     // get histogram for the amounts we need