diff --git a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
index 786f5448c..f548b23d4 100644
--- a/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
+++ b/temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowMutableStateImpl.java
@@ -649,7 +649,7 @@ public void applyOnConflictOptions(@Nonnull StartWorkflowExecutionRequest reques
 
       RequestContext ctx = new RequestContext(clock, this, nextEventId);
       ctx.addEvent(eventBuilder.build());
-      store.save(ctx);
+      nextEventId = ctx.commitChanges(store);
 
       StateMachines.WorkflowData data = workflow.getData();
       if (options.getAttachRequestId()) {