diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java
index f87619b0a..6f250986f 100644
--- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java
+++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java
@@ -184,6 +184,11 @@ public class SendResponseFilter extends ZuulFilter {
 				}
 			}
 
+			//cleanup ThreadLocal when we are all done
+			if(buffers != null) {
+				buffers.remove();
+			}
+
 			try {
 				Object zuulResponse = context.get("zuulResponse");
 				if (zuulResponse instanceof Closeable) {