diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index d5c611aadfc..f211a7b9683 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -341,11 +341,12 @@ impl BaseSystemContracts {
         let hash = hash_bytecode(&bytecode);
 
         let default_aa = SystemContractCode {
-            code: bytes_to_be_words(bytecode),
+            code: bytes_to_be_words(bytecode.clone()),
             hash,
         };
 
-        let mut evm_simulator_bytecode = vec![];
+        // If evm simulator is not enabled, use the default account bytecode and hash.
+        let mut evm_simulator_bytecode = bytecode;
         let mut evm_simulator_hash =
             // H256::from_str("0x0100000000000000000000000000000000000000000000000000000000000000")
             H256::from_str("0x01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e32")