diff --git a/packages/governance/src/tests/test_timelock.cairo b/packages/governance/src/tests/test_timelock.cairo
index e1db0d8bd..6d85a39c1 100644
--- a/packages/governance/src/tests/test_timelock.cairo
+++ b/packages/governance/src/tests/test_timelock.cairo
@@ -178,6 +178,7 @@ fn test_hash_operation() {
 
     // Manually set hash elements
     let mut expected_hash = PedersenTrait::new(0)
+        .update_with(1) // number of calls
         .update_with(target.contract_address) // call::to
         .update_with(selector!("set_number")) // call::selector
         .update_with(1) // call::calldata.len
@@ -228,6 +229,32 @@ fn test_hash_operation_batch() {
     assert_eq!(hashed_operation, expected_hash);
 }
 
+#[test]
+fn test_hash_operation_and_hash_operations() {
+    let (mut timelock, _) = setup_dispatchers();
+    let predecessor = 123;
+    let salt = SALT;
+
+    // Setup and hash single call
+    let to_1 = contract_address_const::<1>();
+    let selector_1 = 123;
+    let calldata_1 = array![1, 456].span();
+    let call_1 = Call { to: to_1, selector: selector_1, calldata: calldata_1 };
+
+    let hash_single = timelock.hash_operation(call_1, predecessor, salt);
+
+    // Setup and hash batch of single call
+    let to_2 = contract_address_const::<123>();
+    let selector_2 = 2;
+    let calldata_2 = array![456].span();
+    let call_2 = Call { to: to_2, selector: selector_2, calldata: calldata_2 };
+    let single_call_batch = array![call_2].span();
+
+    let hash_batch = timelock.hash_operation_batch(single_call_batch, predecessor, salt);
+
+    assert_ne!(hash_single, hash_batch);
+}
+
 //
 // schedule
 //
diff --git a/packages/governance/src/timelock/timelock_controller.cairo b/packages/governance/src/timelock/timelock_controller.cairo
index 9e70887e7..2dec48951 100644
--- a/packages/governance/src/timelock/timelock_controller.cairo
+++ b/packages/governance/src/timelock/timelock_controller.cairo
@@ -185,11 +185,7 @@ pub mod TimelockControllerComponent {
         fn hash_operation(
             self: @ComponentState<TContractState>, call: Call, predecessor: felt252, salt: felt252,
         ) -> felt252 {
-            PedersenTrait::new(0)
-                .update_with(call)
-                .update_with(predecessor)
-                .update_with(salt)
-                .finalize()
+            Self::hash_operation_batch(self, array![call].span(), predecessor, salt)
         }
 
         /// Returns the identifier of an operation containing a batch of transactions.