diff --git a/src/flushablestorage.h b/src/flushablestorage.h
index b584327be44..d017b8cb5ee 100644
--- a/src/flushablestorage.h
+++ b/src/flushablestorage.h
@@ -59,6 +59,7 @@ class CStorageKV {
     virtual bool Read(const TBytes& key, TBytes& value) const = 0;
     virtual std::unique_ptr<CStorageKVIterator> NewIterator() = 0;
     virtual size_t SizeEstimate() const = 0;
+    virtual void Discard() = 0;
     virtual bool Flush() = 0;
 };
 
@@ -153,6 +154,11 @@ class CStorageLevelDB : public CStorageKV {
         begin.clear();
         return result;
     }
+    void Discard() override {
+        end.clear();
+        begin.clear();
+        batch.Clear();
+    }
     size_t SizeEstimate() const override {
         return batch.SizeEstimate();
     }
@@ -300,6 +306,9 @@ class CFlushableStorageKV : public CStorageKV {
         changed.clear();
         return true;
     }
+    void Discard() override {
+        changed.clear();
+    }
     size_t SizeEstimate() const override {
         return memusage::DynamicUsage(changed);
     }
@@ -478,7 +487,7 @@ class CStorageView {
     }
 
     bool Flush() { return DB().Flush(); }
-
+    void Discard() { DB().Discard(); }
     size_t SizeEstimate() const { return DB().SizeEstimate(); }
 
 protected:
diff --git a/src/init.cpp b/src/init.cpp
index 8e461d57a9a..2cce7b7d2ea 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1600,6 +1600,12 @@ bool AppInitMain(InitInterfaces& interfaces)
                 // Ensure we are on latest DB version
                 pcustomcsview->SetDbVersion(CCustomCSView::DbVersion);
 
+                // make account history db
+                paccountHistoryDB.reset();
+                if (gArgs.GetBoolArg("-acindex", DEFAULT_ACINDEX)) {
+                    paccountHistoryDB = MakeUnique<CAccountHistoryStorage>(GetDataDir() / "history", nCustomCacheSize, false, fReset || fReindexChainState);
+                }
+
                 // If necessary, upgrade from older database format.
                 // This is a no-op if we cleared the coinsviewdb with -reindex or -reindex-chainstate
                 if (!::ChainstateActive().CoinsDB().Upgrade()) {
diff --git a/src/masternodes/accountshistory.cpp b/src/masternodes/accountshistory.cpp
index 3880f2e44cb..b56b3b3744a 100644
--- a/src/masternodes/accountshistory.cpp
+++ b/src/masternodes/accountshistory.cpp
@@ -7,9 +7,7 @@
 #include <masternodes/masternodes.h>
 #include <key_io.h>
 
-#include <limits>
-
-/// @attention make sure that it does not overlap with those in masternodes.cpp/tokens.cpp/undos.cpp/accounts.cpp !!!
+/// @Note it's in own database
 const unsigned char CAccountsHistoryView::ByAccountHistoryKey::prefix = 'h';
 
 void CAccountsHistoryView::ForEachAccountHistory(std::function<bool(AccountHistoryKey const &, CLazySerialize<AccountHistoryValue>)> callback, AccountHistoryKey const & start)
@@ -17,8 +15,85 @@ void CAccountsHistoryView::ForEachAccountHistory(std::function<bool(AccountHisto
     ForEach<ByAccountHistoryKey, AccountHistoryKey, AccountHistoryValue>(callback, start);
 }
 
-Res CAccountsHistoryView::SetAccountHistory(const AccountHistoryKey& key, const AccountHistoryValue& value)
+Res CAccountsHistoryView::WriteAccountHistory(const AccountHistoryKey& key, const AccountHistoryValue& value)
 {
     WriteBy<ByAccountHistoryKey>(key, value);
     return Res::Ok();
 }
+
+Res CAccountsHistoryView::EraseAccountHistory(const AccountHistoryKey& key)
+{
+    EraseBy<ByAccountHistoryKey>(key);
+    return Res::Ok();
+}
+
+CAccountHistoryStorage::CAccountHistoryStorage(const fs::path& dbName, std::size_t cacheSize, bool fMemory, bool fWipe)
+    : CStorageView(new CStorageLevelDB(dbName, cacheSize, fMemory, fWipe))
+{
+}
+
+CAccountsHistoryWriter::CAccountsHistoryWriter(CCustomCSView & storage, uint32_t height, uint32_t txn, const uint256& txid, uint8_t type, CAccountsHistoryView* historyView)
+    : CStorageView(new CFlushableStorageKV(storage.GetRaw())), height(height), txn(txn), txid(txid), type(type), historyView(historyView)
+{
+}
+
+Res CAccountsHistoryWriter::AddBalance(CScript const & owner, CTokenAmount amount)
+{
+    auto res = CCustomCSView::AddBalance(owner, amount);
+    if (historyView && res.ok && amount.nValue != 0) {
+        diffs[owner][amount.nTokenId] += amount.nValue;
+    }
+    return res;
+}
+
+Res CAccountsHistoryWriter::SubBalance(CScript const & owner, CTokenAmount amount)
+{
+    auto res = CCustomCSView::SubBalance(owner, amount);
+    if (historyView && res.ok && amount.nValue != 0) {
+        diffs[owner][amount.nTokenId] -= amount.nValue;
+    }
+    return res;
+}
+
+bool CAccountsHistoryWriter::Flush()
+{
+    if (historyView) {
+        for (const auto& diff : diffs) {
+            historyView->WriteAccountHistory({diff.first, height, txn}, {txid, type, diff.second});
+        }
+    }
+    return CCustomCSView::Flush();
+}
+
+CAccountsHistoryEraser::CAccountsHistoryEraser(CCustomCSView & storage, uint32_t height, uint32_t txn, CAccountsHistoryView* historyView)
+    : CStorageView(new CFlushableStorageKV(storage.GetRaw())), height(height), txn(txn), historyView(historyView)
+{
+}
+
+Res CAccountsHistoryEraser::AddBalance(CScript const & owner, CTokenAmount)
+{
+    if (historyView) {
+        accounts.insert(owner);
+    }
+    return Res::Ok();
+}
+
+Res CAccountsHistoryEraser::SubBalance(CScript const & owner, CTokenAmount)
+{
+    if (historyView) {
+        accounts.insert(owner);
+    }
+    return Res::Ok();
+}
+
+bool CAccountsHistoryEraser::Flush()
+{
+    if (historyView) {
+        for (const auto& account : accounts) {
+            historyView->EraseAccountHistory({account, height, txn});
+        }
+    }
+    return CCustomCSView::Flush();
+}
+
+std::unique_ptr<CAccountHistoryStorage> paccountHistoryDB;
diff --git a/src/masternodes/accountshistory.h b/src/masternodes/accountshistory.h
index 13005cb7c45..3e0066a20e3 100644
--- a/src/masternodes/accountshistory.h
+++ b/src/masternodes/accountshistory.h
@@ -7,10 +7,10 @@
 
 #include <amount.h>
 #include <flushablestorage.h>
+#include <masternodes/masternodes.h>
 #include <script/script.h>
 #include <uint256.h>
 
-
 struct AccountHistoryKey {
     CScript owner;
     uint32_t blockHeight;
@@ -55,13 +55,52 @@ struct AccountHistoryValue {
 class CAccountsHistoryView : public virtual CStorageView
 {
 public:
-    Res SetAccountHistory(AccountHistoryKey const & key, AccountHistoryValue const & value);
+    Res WriteAccountHistory(AccountHistoryKey const & key, AccountHistoryValue const & value);
+    Res EraseAccountHistory(AccountHistoryKey const & key);
     void ForEachAccountHistory(std::function<bool(AccountHistoryKey const &, CLazySerialize<AccountHistoryValue>)> callback, AccountHistoryKey const & start = {});
 
     // tags
     struct ByAccountHistoryKey { static const unsigned char prefix; };
 };
 
+class CAccountHistoryStorage : public CAccountsHistoryView
+{
+public:
+    CAccountHistoryStorage(const fs::path& dbName, std::size_t cacheSize, bool fMemory = false, bool fWipe = false);
+};
+
+class CAccountsHistoryWriter : public CCustomCSView
+{
+    const uint32_t height;
+    const uint32_t txn;
+    const uint256 txid;
+    const uint8_t type;
+    std::map<CScript, TAmounts> diffs;
+    CAccountsHistoryView* historyView;
+
+public:
+    CAccountsHistoryWriter(CCustomCSView & storage, uint32_t height, uint32_t txn, const uint256& txid, uint8_t type, CAccountsHistoryView* historyView);
+    Res AddBalance(CScript const & owner, CTokenAmount amount) override;
+    Res SubBalance(CScript const & owner, CTokenAmount amount) override;
+    bool Flush();
+};
+
+class CAccountsHistoryEraser : public CCustomCSView
+{
+    const uint32_t height;
+    const uint32_t txn;
+    std::set<CScript> accounts;
+    CAccountsHistoryView* historyView;
+
+public:
+    CAccountsHistoryEraser(CCustomCSView & storage, uint32_t height, uint32_t txn, CAccountsHistoryView* historyView);
+    Res AddBalance(CScript const & owner, CTokenAmount amount) override;
+    Res SubBalance(CScript const & owner, CTokenAmount amount) override;
+    bool Flush();
+};
+
+extern std::unique_ptr<CAccountHistoryStorage> paccountHistoryDB;
+
 static constexpr bool DEFAULT_ACINDEX = true;
 
 #endif //DEFI_MASTERNODES_ACCOUNTSHISTORY_H
diff --git a/src/masternodes/masternodes.cpp b/src/masternodes/masternodes.cpp
index ab0d30ae419..efdb6ef7ed1 100644
--- a/src/masternodes/masternodes.cpp
+++ b/src/masternodes/masternodes.cpp
@@ -768,40 +768,6 @@ bool CCustomCSView::CalculateOwnerRewards(CScript const & owner, uint32_t target
     return UpdateBalancesHeight(owner, targetHeight);
 }
 
-CAccountsHistoryStorage::CAccountsHistoryStorage(CCustomCSView & storage, uint32_t height, uint32_t txn, const uint256& txid, uint8_t type)
-    : CStorageView(new CFlushableStorageKV(storage.GetRaw())), height(height), txn(txn), txid(txid), type(type)
-{
-    acindex = gArgs.GetBoolArg("-acindex", DEFAULT_ACINDEX);
-}
-
-Res CAccountsHistoryStorage::AddBalance(CScript const & owner, CTokenAmount amount)
-{
-    auto res = CCustomCSView::AddBalance(owner, amount);
-    if (acindex && res.ok && amount.nValue != 0) {
-        diffs[owner][amount.nTokenId] += amount.nValue;
-    }
-    return res;
-}
-
-Res CAccountsHistoryStorage::SubBalance(CScript const & owner, CTokenAmount amount)
-{
-    auto res = CCustomCSView::SubBalance(owner, amount);
-    if (acindex && res.ok && amount.nValue != 0) {
-        diffs[owner][amount.nTokenId] -= amount.nValue;
-    }
-    return res;
-}
-
-bool CAccountsHistoryStorage::Flush()
-{
-    if (acindex) {
-        for (const auto& diff : diffs) {
-            SetAccountHistory({diff.first, height, txn}, {txid, type, diff.second});
-        }
-    }
-    return CCustomCSView::Flush();
-}
-
 std::map<CKeyID, CKey> AmISignerNow(CAnchorData::CTeam const & team)
 {
     AssertLockHeld(cs_main);
diff --git a/src/masternodes/masternodes.h b/src/masternodes/masternodes.h
index 62f63d6ce65..0616a4423ef 100644
--- a/src/masternodes/masternodes.h
+++ b/src/masternodes/masternodes.h
@@ -10,7 +10,6 @@
 #include <pubkey.h>
 #include <serialize.h>
 #include <masternodes/accounts.h>
-#include <masternodes/accountshistory.h>
 #include <masternodes/anchors.h>
 #include <masternodes/incentivefunding.h>
 #include <masternodes/tokens.h>
@@ -240,7 +239,6 @@ class CCustomCSView
         , public CAnchorRewardsView
         , public CTokensView
         , public CAccountsView
-        , public CAccountsHistoryView
         , public CCommunityBalancesView
         , public CUndosView
         , public CPoolPairView
@@ -286,21 +284,6 @@ class CCustomCSView
     }
 };
 
-class CAccountsHistoryStorage : public CCustomCSView
-{
-    bool acindex;
-    const uint32_t height;
-    const uint32_t txn;
-    const uint256 txid;
-    const uint8_t type;
-    std::map<CScript, TAmounts> diffs;
-public:
-    CAccountsHistoryStorage(CCustomCSView & storage, uint32_t height, uint32_t txn, const uint256& txid, uint8_t type);
-    Res AddBalance(CScript const & owner, CTokenAmount amount) override;
-    Res SubBalance(CScript const & owner, CTokenAmount amount) override;
-    bool Flush();
-};
-
 std::map<CKeyID, CKey> AmISignerNow(CAnchorData::CTeam const & team);
 
 /** Global DB and view that holds enhanced chainstate data (should be protected by cs_main) */
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
index 88c5495d71f..692a36b5b31 100644
--- a/src/masternodes/mn_checks.cpp
+++ b/src/masternodes/mn_checks.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
+#include <masternodes/accountshistory.h>
 #include <masternodes/anchors.h>
 #include <masternodes/balances.h>
 #include <masternodes/mn_checks.h>
@@ -984,6 +985,74 @@ class CCustomTxRevertVisitor : public CCustomTxVisitor
 
         return mnview.RevertCreateToken(tx.GetHash());
     }
+
+    Res operator()(const CMintTokensMessage& obj) const {
+        for (const auto& kv : obj.balances) {
+            DCT_ID tokenId = kv.first;
+
+            auto token = mnview.GetToken(tokenId);
+            if (!token) {
+                return Res::Err("token %s does not exist!", tokenId.ToString());
+            }
+            auto tokenImpl = static_cast<const CTokenImplementation&>(*token);
+
+            const Coin& coin = coins.AccessCoin(COutPoint(tokenImpl.creationTx, 1));
+            // notify account changes
+            mnview.AddBalance(coin.out.scriptPubKey, {});
+        }
+        return Res::Ok();
+    }
+
+    Res operator()(const CPoolSwapMessage& obj) const {
+        // notify account changes
+        mnview.AddBalance(obj.to, {});
+        return mnview.SubBalance(obj.from, {});
+    }
+
+    Res operator()(const CLiquidityMessage& obj) const {
+        // notify account changes
+        for (const auto& kv : obj.from) {
+            mnview.SubBalance(kv.first, {});
+        }
+        return mnview.AddBalance(obj.shareAddress, {});
+    }
+
+    Res operator()(const CRemoveLiquidityMessage& obj) const {
+        // notify account changes
+        return mnview.SubBalance(obj.from, {});
+    }
+
+    Res operator()(const CUtxosToAccountMessage& obj) const {
+        // notify account changes
+        for (const auto& account : obj.to) {
+            mnview.AddBalance(account.first, {});
+        }
+        return Res::Ok();
+    }
+
+    Res operator()(const CAccountToUtxosMessage& obj) const {
+        // notify account changes
+        return mnview.SubBalance(obj.from, {});
+    }
+
+    Res operator()(const CAccountToAccountMessage& obj) const {
+        // notify account changes
+        for (const auto& account : obj.to) {
+            mnview.AddBalance(account.first, {});
+        }
+        return mnview.SubBalance(obj.from, {});
+    }
+
+    Res operator()(const CAnyAccountsToAccountsMessage& obj) const {
+        // notify account changes
+        for (const auto& account : obj.to) {
+            mnview.AddBalance(account.first, {});
+        }
+        for (const auto& account : obj.from) {
+            mnview.AddBalance(account.first, {});
+        }
+        return Res::Ok();
+    }
 };
 
 Res CustomMetadataParse(uint32_t height, const Consensus::Params& consensus, const std::vector<unsigned char>& metadata, CCustomTxMessage& txMessage) {
@@ -1024,21 +1093,38 @@ bool ShouldReturnNonFatalError(const CTransaction& tx, uint32_t height) {
     return it != skippedTx.end() && it->second == tx.GetHash();
 }
 
-Res RevertCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height) {
+Res RevertCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint32_t txn, CAccountsHistoryView* historyView) {
     if (tx.IsCoinBase() && height > 0) { // genesis contains custom coinbase txs
         return Res::Ok();
     }
+    auto res = Res::Ok();
     std::vector<unsigned char> metadata;
     auto txType = GuessCustomTxType(tx, metadata);
-    if (txType == CustomTxType::None) {
-        return Res::Ok();
+    switch(txType)
+    {
+        case CustomTxType::CreateMasternode:
+        case CustomTxType::ResignMasternode:
+        case CustomTxType::CreateToken:
+        case CustomTxType::CreatePoolPair:
+            // Enable these in the future
+        case CustomTxType::None:
+            return res;
+        default:
+            break;
     }
     auto txMessage = customTypeToMessage(txType);
-    auto res = CustomMetadataParse(height, consensus, metadata, txMessage);
-    return !res ? res : CustomTxRevert(mnview, coins, tx, height, consensus, txMessage);
+    CAccountsHistoryEraser view(mnview, height, txn, historyView);
+    if ((res = CustomMetadataParse(height, consensus, metadata, txMessage))) {
+        res = CustomTxRevert(view, coins, tx, height, consensus, txMessage);
+    }
+    if (!res) {
+        res.msg = strprintf("%sRevertTx: %s", ToString(txType), res.msg);
+        return res;
+    }
+    return (view.Flush(), res);
 }
 
-Res ApplyCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint64_t time, uint32_t txn) {
+Res ApplyCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint64_t time, uint32_t txn, CAccountsHistoryView* historyView) {
     auto res = Res::Ok();
     if (tx.IsCoinBase() && height > 0) { // genesis contains custom coinbase txs
         return res;
@@ -1049,7 +1135,7 @@ Res ApplyCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTr
         return res;
     }
     auto txMessage = customTypeToMessage(txType);
-    CAccountsHistoryStorage view(mnview, height, txn, tx.GetHash(), uint8_t(txType));
+    CAccountsHistoryWriter view(mnview, height, txn, tx.GetHash(), uint8_t(txType), historyView);
     if ((res = CustomMetadataParse(height, consensus, metadata, txMessage))) {
         res = CustomTxVisit(view, coins, tx, height, consensus, txMessage, time);
     }
diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
index 457299ddc78..84257fbd711 100644
--- a/src/masternodes/mn_checks.h
+++ b/src/masternodes/mn_checks.h
@@ -19,6 +19,7 @@ class CTxMemPool;
 class CCoinsViewCache;
 
 class CCustomCSView;
+class CAccountsHistoryView;
 
 static const std::vector<unsigned char> DfTxMarker = {'D', 'f', 'T', 'x'};  // 44665478
 
@@ -209,9 +210,9 @@ CCustomTxMessage customTypeToMessage(CustomTxType txType);
 bool IsMempooledCustomTxCreate(const CTxMemPool& pool, const uint256& txid);
 Res RpcInfo(const CTransaction& tx, uint32_t height, CustomTxType& type, UniValue& results);
 Res CustomMetadataParse(uint32_t height, const Consensus::Params& consensus, const std::vector<unsigned char>& metadata, CCustomTxMessage& txMessage);
-Res ApplyCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint64_t time = 0, uint32_t txn = 0);
+Res ApplyCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint64_t time = 0, uint32_t txn = 0, CAccountsHistoryView* historyView = nullptr);
+Res RevertCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height, uint32_t txn = 0, CAccountsHistoryView* historyView = nullptr);
 Res CustomTxVisit(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, uint32_t height, const Consensus::Params& consensus, const CCustomTxMessage& txMessage, uint64_t time = 0);
-Res RevertCustomTx(CCustomCSView& mnview, const CCoinsViewCache& coins, const CTransaction& tx, const Consensus::Params& consensus, uint32_t height);
 ResVal<uint256> ApplyAnchorRewardTx(CCustomCSView& mnview, const CTransaction& tx, int height, const uint256& prevStakeModifier, const std::vector<unsigned char>& metadata, const Consensus::Params& consensusParams);
 ResVal<uint256> ApplyAnchorRewardTxPlus(CCustomCSView& mnview, const CTransaction& tx, int height, const std::vector<unsigned char>& metadata, const Consensus::Params& consensusParams);
 
diff --git a/src/masternodes/rpc_accounts.cpp b/src/masternodes/rpc_accounts.cpp
index a33bf88bf92..d904cdccf71 100644
--- a/src/masternodes/rpc_accounts.cpp
+++ b/src/masternodes/rpc_accounts.cpp
@@ -1,3 +1,4 @@
+#include <masternodes/accountshistory.h>
 #include <masternodes/mn_rpc.h>
 
 std::string tokenAmountString(CTokenAmount const& amount) {
@@ -880,9 +881,7 @@ UniValue listaccounthistory(const JSONRPCRequest& request) {
         accounts = request.params[0].getValStr();
     }
 
-    const auto acindex = gArgs.GetBoolArg("-acindex", DEFAULT_ACINDEX);
-
-    if (!acindex) {
+    if (!paccountHistoryDB) {
         throw JSONRPCError(RPC_INVALID_REQUEST, "-acindex is needed for account history");
     }
 
@@ -1036,7 +1035,7 @@ UniValue listaccounthistory(const JSONRPCRequest& request) {
     };
 
     AccountHistoryKey startKey{account, maxBlockHeight, std::numeric_limits<uint32_t>::max()};
-    view.ForEachAccountHistory(shouldContinueToNextAccountHistory, startKey);
+    paccountHistoryDB->ForEachAccountHistory(shouldContinueToNextAccountHistory, startKey);
 
     if (shouldSearchInWallet) {
         count = limit;
@@ -1094,9 +1093,7 @@ UniValue accounthistorycount(const JSONRPCRequest& request) {
         accounts = request.params[0].getValStr();
     }
 
-    const auto acindex = gArgs.GetBoolArg("-acindex", DEFAULT_ACINDEX);
-
-    if (!acindex) {
+    if (!paccountHistoryDB) {
         throw JSONRPCError(RPC_INVALID_REQUEST, "-acindex is need for account history");
     }
 
@@ -1203,7 +1200,7 @@ UniValue accounthistorycount(const JSONRPCRequest& request) {
     };
 
     AccountHistoryKey startAccountKey{owner, currentHeight, std::numeric_limits<uint32_t>::max()};
-    view.ForEachAccountHistory(shouldContinueToNextAccountHistory, startAccountKey);
+    paccountHistoryDB->ForEachAccountHistory(shouldContinueToNextAccountHistory, startAccountKey);
 
     if (shouldSearchInWallet) {
         searchInWallet(pwallet, owner, filter,
diff --git a/src/test/storage_tests.cpp b/src/test/storage_tests.cpp
index ff02b4b2fdf..36297acb47e 100644
--- a/src/test/storage_tests.cpp
+++ b/src/test/storage_tests.cpp
@@ -440,31 +440,4 @@ BOOST_AUTO_TEST_CASE(LowerBoundTest)
     }
 }
 
-BOOST_AUTO_TEST_CASE(AccountHistoryDescOrderTest)
-{
-    CCustomCSView view(*pcustomcsview);
-
-    view.SetAccountHistory({ {}, 5021, 0 }, {});
-    view.SetAccountHistory({ {}, 5022, 1 }, {});
-    view.SetAccountHistory({ {}, 5023, 2 }, {});
-    view.SetAccountHistory({ {}, 5024, 3 }, {});
-    view.SetAccountHistory({ {}, 5025, 4 }, {});
-    view.SetAccountHistory({ {}, 5026, 5 }, {});
-
-    uint32_t startBlock = 5021; // exclude
-    uint32_t maxBlockHeight = 5025;
-    auto blockCount = maxBlockHeight;
-
-    view.ForEachAccountHistory([&](AccountHistoryKey const & key, AccountHistoryValue) {
-        if (startBlock > key.blockHeight || key.blockHeight > maxBlockHeight) {
-            return true;
-        }
-
-        BOOST_CHECK_EQUAL(blockCount, key.blockHeight);
-        --blockCount;
-
-        return true;
-    }, { {}, maxBlockHeight, std::numeric_limits<uint32_t>::max() });
-}
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/validation.cpp b/src/validation.cpp
index b05f8537633..ee141c7c989 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -18,6 +18,7 @@
 #include <flatfile.h>
 #include <hash.h>
 #include <index/txindex.h>
+#include <masternodes/accountshistory.h>
 #include <masternodes/anchors.h>
 #include <masternodes/criminals.h>
 #include <masternodes/govvariables/lp_daily_dfi_reward.h>
@@ -1729,6 +1730,10 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
 
         // process transactions revert for masternodes
         mnview.OnUndoTx(tx.GetHash(), (uint32_t) pindex->nHeight);
+        auto res = RevertCustomTx(mnview, view, tx, Params().GetConsensus(), (uint32_t) pindex->nHeight, i, paccountHistoryDB.get());
+        if (!res) {
+            LogPrintf("%s\n", res.msg);
+        }
     }
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
@@ -2003,7 +2008,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
             pcustomcsview->CreateDFIToken();
             // init view|db with genesis here
             for (size_t i = 0; i < block.vtx.size(); ++i) {
-                const auto res = ApplyCustomTx(mnview, view, *block.vtx[i], chainparams.GetConsensus(), pindex->nHeight, pindex->GetBlockTime(), i);
+                const auto res = ApplyCustomTx(mnview, view, *block.vtx[i], chainparams.GetConsensus(), pindex->nHeight, pindex->GetBlockTime(), i, paccountHistoryDB.get());
                 if (!res.ok) {
                     return error("%s: Genesis block ApplyCustomTx failed. TX: %s Error: %s",
                                  __func__, block.vtx[i]->GetHash().ToString(), res.msg);
@@ -2254,7 +2259,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
                     tx.GetHash().ToString(), FormatStateMessage(state));
             }
 
-            const auto res = ApplyCustomTx(mnview, view, tx, chainparams.GetConsensus(), pindex->nHeight, pindex->GetBlockTime(), i);
+            const auto res = ApplyCustomTx(mnview, view, tx, chainparams.GetConsensus(), pindex->nHeight, pindex->GetBlockTime(), i, paccountHistoryDB.get());
             if (!res.ok && (res.code & CustomTxErrCodes::Fatal)) {
                 // we will never fail, but skip, unless transaction mints UTXOs
                 return error("ConnectBlock(): ApplyCustomTx on %s failed with %s",
@@ -2683,11 +2688,21 @@ bool CChainState::DisconnectTip(CValidationState& state, const CChainParams& cha
         assert(view.GetBestBlock() == pindexDelete->GetBlockHash());
         std::vector<CAnchorConfirmMessage> disconnectedConfirms;
         std::map<uint256, CDoubleSignFact> disconnectedCriminals;
-        if (DisconnectBlock(block, pindexDelete, view, mnview, disconnectedConfirms, disconnectedCriminals) != DISCONNECT_OK)
+        if (DisconnectBlock(block, pindexDelete, view, mnview, disconnectedConfirms, disconnectedCriminals) != DISCONNECT_OK) {
+            // no usable history
+            if (paccountHistoryDB) {
+                paccountHistoryDB->Discard();
+            }
             return error("DisconnectTip(): DisconnectBlock %s failed", pindexDelete->GetBlockHash().ToString());
+        }
         bool flushed = view.Flush() && mnview.Flush();
         assert(flushed);
 
+        // flush history
+        if (paccountHistoryDB) {
+            paccountHistoryDB->Flush();
+        }
+
         if (!disconnectedConfirms.empty()) {
             for (auto const & confirm : disconnectedConfirms) {
                 panchorAwaitingConfirms->Add(confirm);
@@ -2830,8 +2845,13 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
         bool rv = ConnectBlock(blockConnecting, state, pindexNew, view, mnview, chainparams, rewardedAnchors, bannedCriminals);
         GetMainSignals().BlockChecked(blockConnecting, state);
         if (!rv) {
-            if (state.IsInvalid())
+            if (state.IsInvalid()) {
                 InvalidBlockFound(pindexNew, state);
+            }
+            // no usable history
+            if (paccountHistoryDB) {
+                paccountHistoryDB->Discard();
+            }
             return error("%s: ConnectBlock %s failed, %s", __func__, pindexNew->GetBlockHash().ToString(), FormatStateMessage(state));
         }
         nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;
@@ -2839,6 +2859,11 @@ bool CChainState::ConnectTip(CValidationState& state, const CChainParams& chainp
         bool flushed = view.Flush() && mnview.Flush();
         assert(flushed);
 
+        // flush history
+        if (paccountHistoryDB) {
+            paccountHistoryDB->Flush();
+        }
+
         // anchor rewards re-voting etc...
         if (!rewardedAnchors.empty()) {
             // we do not clear ALL votes (even they are stale) for the case of rapid tip changing. At least, they'll be deleted after their rewards
diff --git a/test/functional/rpc_listaccounthistory.py b/test/functional/rpc_listaccounthistory.py
index 8d98640a994..99a3b522a28 100755
--- a/test/functional/rpc_listaccounthistory.py
+++ b/test/functional/rpc_listaccounthistory.py
@@ -7,15 +7,20 @@
 
 from test_framework.test_framework import DefiTestFramework
 
-from test_framework.util import assert_equal
+from test_framework.util import (
+    assert_equal,
+    connect_nodes_bi
+)
 
 class TokensRPCListAccountHistory(DefiTestFramework):
     def set_test_params(self):
-        self.num_nodes = 2
+        self.num_nodes = 3
         self.setup_clean_chain = True
         self.extra_args = [
-        ['-acindex=1', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-bayfrontgardensheight=50'],
-        ['-acindex=1', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-bayfrontgardensheight=50']]
+            ['-acindex=1', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-bayfrontgardensheight=50'],
+            ['-acindex=1', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-bayfrontgardensheight=50'],
+            ['-acindex=1', '-txnotokens=0', '-amkheight=50', '-bayfrontheight=50', '-bayfrontgardensheight=50'],
+        ]
 
     def run_test(self):
         self.nodes[0].generate(101)
@@ -35,6 +40,9 @@ def run_test(self):
         # Make sure there's an extra token
         assert_equal(len(self.nodes[0].listtokens()), num_tokens + 1)
 
+        # Stop node #2 for future revert
+        self.stop_node(2)
+
         # Get token ID
         list_tokens = self.nodes[0].listtokens()
         for idx, token in list_tokens.items():
@@ -77,5 +85,20 @@ def run_test(self):
         result = self.nodes[1].listaccounthistory()
         assert_equal(result, [])
 
+        # REVERTING:
+        #========================
+        self.start_node(2)
+        self.nodes[2].generate(2)
+
+        connect_nodes_bi(self.nodes, 1, 2)
+        self.sync_blocks()
+
+        # Get node 0 results
+        results = self.nodes[1].listaccounthistory(collateral_a)
+
+        # Expect mint token TX should be reverted
+        assert_equal(len(results), 0)
+        assert_equal(self.nodes[1].accounthistorycount(collateral_a), 0)
+
 if __name__ == '__main__':
     TokensRPCListAccountHistory().main ()