diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
index 68085203d..4fb052e9a 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
@@ -258,7 +258,9 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 
 		@Override
 		public void add(HttpTrace trace) {
-			spanIdsInHttpTrace.add(tracer.currentSpan().context().spanId());
+			if (tracer.currentSpan() != null) {
+				spanIdsInHttpTrace.add(tracer.currentSpan().context().spanId());
+			}
 		}
 
 	}