diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java
index 435d86df8..909ae455d 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SleuthReactorProperties.java
@@ -38,7 +38,7 @@ public class SleuthReactorProperties {
 	 * the feature set of {@link SleuthReactorProperties#decorateOnEach} with the least
 	 * impact on the performance.
 	 */
-	private boolean decorateQueues = true;
+	private boolean decorateQueues = false;
 
 	/**
 	 * When true decorates on each operator, will be less performing, but logging will
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
index 0a24de6be..5e1d53245 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
@@ -105,6 +105,7 @@ public class TraceReactorAutoConfiguration {
 					log.trace("Resetting queue wrapper instrumentation");
 				}
 				Hooks.removeQueueWrapper(SLEUTH_TRACE_REACTOR_KEY);
+				Hooks.resetOnLastOperator(SLEUTH_TRACE_REACTOR_KEY);
 			}
 			if (reactorProperties.isDecorateOnEach()) {
 				if (log.isTraceEnabled()) {
@@ -181,6 +182,8 @@ class HooksRefresher implements ApplicationListener<RefreshScopeRefreshedEvent>
 				log.trace("Adding queue wrapper instrumentation");
 			}
 			HookRegisteringBeanDefinitionRegistryPostProcessor.addQueueWrapper(context);
+			Hooks.onLastOperator(SLEUTH_TRACE_REACTOR_KEY,
+					scopePassingSpanOperator(this.context));
 		}
 		else if (this.reactorProperties.isDecorateOnEach()) {
 			if (log.isTraceEnabled()) {