diff --git a/macros/query_comment.sql b/macros/query_comment.sql
index 6d80ba3..8337ae9 100644
--- a/macros/query_comment.sql
+++ b/macros/query_comment.sql
@@ -11,6 +11,12 @@
         invocation_id=invocation_id
     ) -%}
 
+    {% if thread_id %}
+        {%- do comment_dict.update(
+            thread_id=thread_id
+        ) -%}
+    {% endif %}
+
     {%- if node is not none -%}
         {%- do comment_dict.update(
             node_name=node.name,