diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
index b1a34556..22206f18 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/AbstractStateMachineFactory.java
@@ -556,10 +556,12 @@ public abstract class AbstractStateMachineFactory<S, E> extends LifecycleObjectS
 				if (beanFactory != null) {
 					t.setBeanFactory(beanFactory);
 				}
-                                if( taskScheduler != null )
-                                {
-                                        t.setTaskScheduler(taskScheduler);
-                                }
+				if (taskExecutor != null) {
+					t.setTaskExecutor(taskExecutor);
+				}
+				if (taskScheduler != null) {
+					t.setTaskScheduler(taskScheduler);
+				}
 				trigger = t;
 			}