diff --git a/ledger/src/blocktree_processor.rs b/ledger/src/blocktree_processor.rs
index e56b4daa6..0361f155b 100644
--- a/ledger/src/blocktree_processor.rs
+++ b/ledger/src/blocktree_processor.rs
@@ -943,7 +943,7 @@ pub mod tests {
         assert_eq!(bank_forks_info.len(), 1);
         assert_eq!(bank_forks_info[0], BankForksInfo { bank_slot: 0 });
         let bank = bank_forks[0].clone();
-        assert_eq!(bank.tick_height(), 0);
+        assert_eq!(bank.tick_height(), 1);
     }
 
     #[test]
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 528cdb68b..6f81080fa 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -791,29 +791,13 @@ impl Bank {
 
         // TODO: put this assert back in
         // assert!(!self.is_frozen());
-        let current_tick_height = self.tick_height.load(Ordering::Relaxed) as u64;
-        let should_register_hash = {
-            if self.ticks_per_slot() != 1 || self.slot() != 0 {
-                let lock = {
-                    if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
-                        Some(self.blockhash_queue.write().unwrap())
-                    } else {
-                        None
-                    }
-                };
-                self.tick_height.fetch_add(1, Ordering::Relaxed);
-                inc_new_counter_debug!("bank-register_tick-registered", 1);
-                lock
-            } else if current_tick_height % self.ticks_per_slot == 0 {
-                // Register a new block hash if at the last tick in the slot
-                Some(self.blockhash_queue.write().unwrap())
-            } else {
-                None
-            }
-        };
-
-        if let Some(mut w_blockhash_queue) = should_register_hash {
-            w_blockhash_queue.register_hash(hash, &self.fee_calculator);
+        inc_new_counter_debug!("bank-register_tick-registered", 1);
+        let current_tick_height = self.tick_height.fetch_add(1, Ordering::Relaxed) as u64;
+        if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
+            self.blockhash_queue
+                .write()
+                .unwrap()
+                .register_hash(hash, &self.fee_calculator);
         }
     }