diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ForkJoinEntryExitTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ForkJoinEntryExitTests.java
index 9f7cff8b..3bf37f2d 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ForkJoinEntryExitTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ForkJoinEntryExitTests.java
@@ -92,8 +92,8 @@ public class ForkJoinEntryExitTests extends AbstractBuildTests {
 					.step()
 						.sendEvent("E3")
 						.expectStateEntered(2)
-						// TODO: S211 exited twice
 						.expectStateExited(4)
+						.expectStateExited("S220", "S211", "S221", "S2")
 						.expectStates("S3").and()
 					.build();
 		plan.test();
@@ -123,8 +123,8 @@ public class ForkJoinEntryExitTests extends AbstractBuildTests {
 					.step()
 						.sendEvent("E3")
 						.expectStateEntered(2)
-						// TODO: S211 exited twice
 						.expectStateExited(4)
+						.expectStateExited("S220", "S211", "S221", "S2")
 						.expectStates("S3").and()
 					.build();
 		plan.test();
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/ReactiveStateMachineExecutor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/ReactiveStateMachineExecutor.java
index 033b3fb6..e73db270 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/ReactiveStateMachineExecutor.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/ReactiveStateMachineExecutor.java
@@ -386,7 +386,7 @@ public class ReactiveStateMachineExecutor<S, E> extends LifecycleObjectSupport i
 						return Flux.fromIterable(joinSyncTransitions)
 							.flatMap(tt -> {
 								StateContext<S, E> stateContext = buildStateContext(queuedMessage, tt, relayStateMachine);
-								return tt.transit(stateContext).then(stateMachineExecutorTransit.transit(t, stateContext, queuedMessage));
+								return tt.transit(stateContext).then(stateMachineExecutorTransit.transit(tt, stateContext, queuedMessage));
 							})
 							.doFinally(s -> {
 								joinSyncTransitions.clear();