diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
index 16c63351..60ee5491 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/EnumStateMachineFactory.java
@@ -295,7 +295,9 @@ public class EnumStateMachineFactory<S extends Enum<S>, E extends Enum<E>> exten
 			state = stateMap.get(stateData.getState());
 			if (state != null) {
 				states.add(state);
-				initialState = state;
+				if (stateData.isInitial()) {
+					initialState = state;					
+				}
 				continue;
 			}
 			if (stateMachine != null) {