diff --git a/Cargo.lock b/Cargo.lock
index f02e62510d..2aa5e428ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4881,7 +4881,7 @@ name = "token_kind_migration"
 version = "1.0.0"
 dependencies = [
  "anyhow",
- "tokio 1.9.0",
+ "tokio",
  "zksync_config",
  "zksync_contracts",
  "zksync_eth_client",
diff --git a/core/lib/storage/migrations/2021-08-19-113122_token_kind/up.sql b/core/lib/storage/migrations/2021-08-19-113122_token_kind/up.sql
index 4c08cb2ccf..ec554d920c 100644
--- a/core/lib/storage/migrations/2021-08-19-113122_token_kind/up.sql
+++ b/core/lib/storage/migrations/2021-08-19-113122_token_kind/up.sql
@@ -1,4 +1,3 @@
 CREATE TYPE token_kind AS ENUM ('ERC20', 'NFT', 'None');
 ALTER TABLE tokens ADD COLUMN kind token_kind NOT NULL DEFAULT 'ERC20';
 UPDATE tokens SET kind = 'NFT' WHERE is_nft = true;
-ALTER TABLE tokens DROP COLUMN is_nft;
diff --git a/core/lib/storage/src/chain/state/mod.rs b/core/lib/storage/src/chain/state/mod.rs
index 12e19177c2..249676e230 100644
--- a/core/lib/storage/src/chain/state/mod.rs
+++ b/core/lib/storage/src/chain/state/mod.rs
@@ -789,7 +789,7 @@ impl<'a, 'c> StateSchema<'a, 'c> {
     pub async fn mint_nft_updates_set_nonces(&mut self) -> QueryResult<()> {
         let records = sqlx::query!(
             r#"
-                SELECT tx FROM executed_transactions WHERE tx->'type' = '"MintNFT"'
+                SELECT tx FROM executed_transactions WHERE tx->'type' = '"MintNFT"' AND success = true
                 ORDER BY nonce
             "#
         )