diff --git a/elasticsearch_serverless/_otel.py b/elasticsearch_serverless/_otel.py
index 9d0863b..f76ca7e 100644
--- a/elasticsearch_serverless/_otel.py
+++ b/elasticsearch_serverless/_otel.py
@@ -106,7 +106,7 @@ def helpers_span(self, span_name: str) -> Generator[OpenTelemetrySpan, None, Non
 
     @contextlib.contextmanager
     def use_span(self, span: OpenTelemetrySpan) -> Generator[None, None, None]:
-        if not self.enabled or self.tracer is None:
+        if not self.enabled or self.tracer is None or span.otel_span is None:
             yield
             return
 
diff --git a/noxfile.py b/noxfile.py
index 5c0365a..6cd0514 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -78,14 +78,16 @@ def format(session):
 
 @nox.session()
 def lint(session):
-    session.install("flake8", "black~=24.0", "mypy", "isort", "types-requests")
+    session.install(
+        "flake8", "black~=24.0", "mypy", "isort", "types-requests", "opentelemetry-api"
+    )
 
     session.run("isort", "--check", "--profile=black", *SOURCE_FILES)
     session.run("black", "--check", *SOURCE_FILES)
     session.run("flake8", *SOURCE_FILES)
     session.run("python", "utils/license-headers.py", "check", *SOURCE_FILES)
 
-    session.install(".[async,requests,orjson,pyarrow]", env=INSTALL_ENV)
+    session.install(".[dev]", env=INSTALL_ENV)
 
     # Run mypy on the package and then the type examples separately for
     # the two different mypy use-cases, ourselves and our users.