diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
index 6e7d7490..c9e5d1ed 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowExecutionHolderUtils.java
@@ -107,8 +107,8 @@ public class FlowExecutionHolderUtils {
 	 */
 	public static void cleanupCurrentFlowExecution(FacesContext context) {
 		if (isFlowExecutionRestored(context)) {
-			getFlowExecutionHolder(context).unlockFlowExecutionIfNecessary();
 			FlowExecutionContextHolder.setFlowExecutionContext(null);
+			getFlowExecutionHolder(context).unlockFlowExecutionIfNecessary();
 			context.getExternalContext().getRequestMap().remove(getFlowExecutionHolderKey());
 		}
 	}