diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
index f6fa55af..d3036e26 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java
@@ -567,7 +567,7 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
 		return id;
 	}
 
-	protected boolean acceptEvent(Message<E> message) {
+	protected synchronized boolean acceptEvent(Message<E> message) {
 		if ((currentState != null && currentState.shouldDefer(message))) {
 			log.info("Current state " + currentState + " deferred event " + message);
 			stateMachineExecutor.queueDeferredEvent(message);
@@ -712,7 +712,7 @@ public abstract class AbstractStateMachine<S, E> extends StateMachineObjectSuppo
 		return null;
 	}
 
-	void setCurrentState(State<S, E> state, Message<E> message, Transition<S, E> transition, boolean exit, StateMachine<S, E> stateMachine) {
+	synchronized void setCurrentState(State<S, E> state, Message<E> message, Transition<S, E> transition, boolean exit, StateMachine<S, E> stateMachine) {
 
 		State<S, E> findDeep = findDeepParent(state);
 		boolean isTargetSubOf = false;