diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
index eb95e9d72..4d22b21c4 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
@@ -29,8 +29,8 @@ import com.netflix.zuul.ZuulFilter;
  * @author Dave Syer
  *
  */
-public class TracePostZuulFilter extends ZuulFilter implements
-ApplicationEventPublisherAware {
+public class TracePostZuulFilter extends ZuulFilter
+		implements ApplicationEventPublisherAware {
 
 	private ApplicationEventPublisher publisher;
 
@@ -41,7 +41,7 @@ ApplicationEventPublisherAware {
 
 	@Override
 	public boolean shouldFilter() {
-		return true;
+		return getCurrentSpan() != null;
 	}
 
 	@Override