diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs
index 5eb3857ae3..3342a18187 100644
--- a/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -513,7 +513,9 @@ impl AccountsDB {
                 .contains_key(&pubkey)
             {
                 let mut waccount_maps = self.account_index.account_maps.write().unwrap();
-                waccount_maps.insert(*pubkey, RwLock::new(HashMap::new()));
+                if !waccount_maps.contains_key(&pubkey) {
+                    waccount_maps.insert(*pubkey, RwLock::new(HashMap::new()));
+                }
             }
         }
         self.store_account(fork, pubkey, account);