diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 2c4da6e3c0..4e753c65f1 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -2721,12 +2721,6 @@ mod tests {
         bank.rent_collector.slots_per_year = 421_812.0;
         bank.add_instruction_processor(mock_program_id, mock_process_instruction);
 
-        let system_program_id = solana_system_program().1;
-        let mut system_program_account = bank.get_account(&system_program_id).unwrap();
-        system_program_account.lamports =
-            bank.get_minimum_balance_for_rent_exemption(system_program_account.data.len());
-        bank.store_account(&system_program_id, &system_program_account);
-
         bank
     }
 
@@ -2954,6 +2948,39 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_rent_exempt_executable_account() {
+        let (mut genesis_config, mint_keypair) = create_genesis_config(100000);
+        genesis_config.rent = Rent {
+            lamports_per_byte_year: 1,
+            exemption_threshold: 1000.0,
+            burn_percent: 10,
+        };
+
+        let root_bank = Arc::new(Bank::new(&genesis_config));
+        let bank = create_child_bank_for_rent_test(&root_bank, &genesis_config, Pubkey::new_rand());
+
+        let account_pubkey = Pubkey::new_rand();
+        let account_balance = 1;
+        let mut account = Account::new(account_balance, 0, &Pubkey::new_rand());
+        account.executable = true;
+        bank.store_account(&account_pubkey, &account);
+
+        let transfer_lamports = 1;
+        let tx = system_transaction::transfer(
+            &mint_keypair,
+            &account_pubkey,
+            transfer_lamports,
+            genesis_config.hash(),
+        );
+
+        assert_eq!(bank.process_transaction(&tx), Ok(()));
+        assert_eq!(
+            bank.get_balance(&account_pubkey),
+            account_balance + transfer_lamports
+        );
+    }
+
     #[test]
     #[allow(clippy::cognitive_complexity)]
     fn test_rent_complex() {
diff --git a/runtime/src/rent_collector.rs b/runtime/src/rent_collector.rs
index 4f38ac36f6..525d7d3b51 100644
--- a/runtime/src/rent_collector.rs
+++ b/runtime/src/rent_collector.rs
@@ -36,7 +36,8 @@ impl RentCollector {
     //  the account rent collected, if any
     //
     pub fn update(&self, account: &mut Account) -> u64 {
-        if account.rent_epoch > self.epoch || sysvar::check_id(&account.owner) {
+        if account.executable || account.rent_epoch > self.epoch || sysvar::check_id(&account.owner)
+        {
             0
         } else {
             let slots_elapsed: u64 = (account.rent_epoch..=self.epoch)