diff --git a/crates/katana/core/src/service/messaging/service.rs b/crates/katana/core/src/service/messaging/service.rs
index 006321dc7c..785db44f5c 100644
--- a/crates/katana/core/src/service/messaging/service.rs
+++ b/crates/katana/core/src/service/messaging/service.rs
@@ -83,7 +83,7 @@ impl MessagingService {
     ) -> MessengerResult<(u64, usize)> {
         // 200 avoids any possible rejection from RPC with possibly lot's of messages.
         // TODO: May this be configurable?
-        let max_block = 200;
+        let max_block = 20;
 
         match messenger.as_ref() {
             MessengerMode::Ethereum(inner) => {
diff --git a/crates/katana/core/src/service/messaging/starknet.rs b/crates/katana/core/src/service/messaging/starknet.rs
index 3271da958d..53c92732cc 100644
--- a/crates/katana/core/src/service/messaging/starknet.rs
+++ b/crates/katana/core/src/service/messaging/starknet.rs
@@ -125,7 +125,7 @@ impl StarknetMessaging {
             ExecutionEncoding::New,
         );
 
-        account.set_block_id(BlockId::Tag(BlockTag::Latest));
+        account.set_block_id(BlockId::Tag(BlockTag::Pending));
 
         // TODO: we need to have maximum fee configurable.
         let execution = account.execute(calls);