diff --git a/engine/src/main/java/io/camunda/zeebe/process/test/engine/EngineFactory.java b/engine/src/main/java/io/camunda/zeebe/process/test/engine/EngineFactory.java
index a11c3d46..e338431d 100644
--- a/engine/src/main/java/io/camunda/zeebe/process/test/engine/EngineFactory.java
+++ b/engine/src/main/java/io/camunda/zeebe/process/test/engine/EngineFactory.java
@@ -47,12 +47,18 @@ public static ZeebeTestEngine create(final int port) {
         new SubscriptionCommandSenderFactory(
             logStream.newLogStreamRecordWriter().join(), partitionId);
 
+    final GatewayRequestStore gatewayRequestStore = new GatewayRequestStore();
     final GrpcToLogStreamGateway gateway =
         new GrpcToLogStreamGateway(
-            logStream.newLogStreamRecordWriter().join(), partitionId, partitionCount, port);
+            logStream.newLogStreamRecordWriter().join(),
+            partitionId,
+            partitionCount,
+            port,
+            gatewayRequestStore);
     final Server grpcServer = ServerBuilder.forPort(port).addService(gateway).build();
 
-    final GrpcResponseWriter grpcResponseWriter = new GrpcResponseWriter(gateway);
+    final GrpcResponseWriter grpcResponseWriter =
+        new GrpcResponseWriter(gateway, gatewayRequestStore);
 
     final ZeebeDb<ZbColumnFamilies> zeebeDb = createDatabase();