diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java b/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
index ea62dd03c..768189e0a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java
@@ -581,6 +581,8 @@ class ContainerImpl implements Container {
 			} finally {
 				// Only remove the context if this call created it.
 				reference[0] = null;
+				// WW-3768: ThreadLocal was not removed
+				localContext.remove();
 			}
 		} else {
 			// Someone else will clean up this context.