diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index a26997fbd..3b69a5928 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -287,6 +287,9 @@ public class Dispatcher {
         	interceptor.destroy();
         }
 
+        //cleanup action context
+        ActionContext.setContext(null);
+
         // clean up configuration
     	configurationManager.destroyConfiguration();
     	configurationManager = null;