diff --git a/src/com/walmartlabs/lacinia.clj b/src/com/walmartlabs/lacinia.clj
index f3841642..fc261961 100644
--- a/src/com/walmartlabs/lacinia.clj
+++ b/src/com/walmartlabs/lacinia.clj
@@ -77,7 +77,7 @@
           :or {timeout-ms 0
                timeout-error {:message "Query execution timed out."}}} options
          context' (cond-> context
-                   (:analyze-query options) query-analyzer/enable-query-analyzer)
+                    (:analyze-query options) query-analyzer/enable-query-analyzer)
          execution-result (execute-parsed-query-async parsed-query variables context')
          result (do
                   (resolve/on-deliver! execution-result *result)
@@ -90,7 +90,9 @@
      (when (instance? Throwable result)
        (throw result))
 
-     result)))
+     (if (:analyze-query options)
+       (assoc-in result [:extensions :analysis] (query-analyzer/complexity-analysis parsed-query))
+       result))))
 
 (defn execute
   "Given a compiled schema and a query string, attempts to execute it.
diff --git a/src/com/walmartlabs/lacinia/executor.clj b/src/com/walmartlabs/lacinia/executor.clj
index 931cf2a3..4b8c6259 100644
--- a/src/com/walmartlabs/lacinia/executor.clj
+++ b/src/com/walmartlabs/lacinia/executor.clj
@@ -385,9 +385,7 @@
       (let [enabled-selections (remove :disabled? selections)
             *errors (atom [])
             *warnings (atom [])
-            *extensions (if (::query-analyzer/enable? context)
-                          (atom {:analysis (query-analyzer/complexity-analysis parsed-query)})
-                          (atom {}))
+            *extensions (atom {})
             *resolver-tracing (when (::tracing/enabled? context)
                                 (atom []))
             context' (assoc context constants/schema-key schema)