diff --git a/instana/instrumentation/aiohttp/client.py b/instana/instrumentation/aiohttp/client.py
index 412822ca..518606b6 100644
--- a/instana/instrumentation/aiohttp/client.py
+++ b/instana/instrumentation/aiohttp/client.py
@@ -18,6 +18,7 @@ async def stan_request_start(session, trace_config_ctx, params):
 
             # If we're not tracing, just return
             if parent_span is None:
+                trace_config_ctx.scope = None
                 return
 
             scope = async_tracer.start_active_span("aiohttp-client", child_of=parent_span)
diff --git a/setup.py b/setup.py
index 847590a9..681be0c3 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ def check_setuptools():
         'test': [
             'aiohttp>=3.5.4;python_version>="3.5"',
             'asynqp>=0.4;python_version>="3.5"',
-            'django>=1.11',
+            'django>=1.11,<2.2',
             'nose>=1.0',
             'flask>=0.12.2',
             'lxml>=3.4',