diff --git a/src/rpc/rpcHandler.ts b/src/rpc/rpcHandler.ts
index f2c30cdd..72ad326c 100644
--- a/src/rpc/rpcHandler.ts
+++ b/src/rpc/rpcHandler.ts
@@ -491,10 +491,10 @@ export class RpcHandler implements IRpcEndpoint {
         ) {
             paymasterVerificationGasLimit =
                 executionResult.data.executionResult
-                    .paymasterVerificationGasLimit || 1n
+                    .paymasterVerificationGasLimit || 0n
             paymasterPostOpGasLimit =
                 executionResult.data.executionResult.paymasterPostOpGasLimit ||
-                1n
+                0n
 
             const multiplier = Number(this.config.paymasterGasLimitMultiplier)
 
diff --git a/test/e2e/docker-compose.yml b/test/e2e/docker-compose.yml
index 499242ad..a24bd868 100644
--- a/test/e2e/docker-compose.yml
+++ b/test/e2e/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   anvil:
     image: ghcr.io/foundry-rs/foundry:nightly-503792a1dbadd901a4c02f6fcd1de1caff1573ff
     ports: [ "8545:8545" ]
-    entrypoint: [ "anvil", "--host", "0.0.0.0", "--silent" ]
+    entrypoint: [ "anvil", "--host", "0.0.0.0", "--silent", "--code-size-limit", "250000"]
     platform: linux/amd64/v8
 
   deploy-contracts: