diff --git a/databend_py/connection.py b/databend_py/connection.py
index d4eedf6..273d033 100644
--- a/databend_py/connection.py
+++ b/databend_py/connection.py
@@ -2,6 +2,8 @@
 import os
 import base64
 import time
+import uuid
+
 from requests.auth import HTTPBasicAuth
 
 import environs
@@ -13,7 +15,7 @@
 from databend_py.retry import retry
 from databend_py.sdk_info import sdk_info
 
-XDatabendQueryIDHeader = "X-Databend-Query-Id"
+XDatabendQueryIDHeader = "X-DATABEND-QUERY-ID"
 XDatabendTenantHeader = "X-DATABEND-TENANT"
 XDatabendWarehouseHeader = "X-DATABEND-WAREHOUSE"
 QueryID = "id"
@@ -171,8 +173,9 @@ def query(self, statement):
         else:
             self.client_session = self.default_session()
             query_sql['session'] = self.client_session
-        if XDatabendQueryIDHeader in self.additional_headers:
-            del self.additional_headers[XDatabendQueryIDHeader]
+        # if XDatabendQueryIDHeader in self.additional_headers:
+        #     del self.additional_headers[XDatabendQueryIDHeader]
+        self.additional_headers.update({XDatabendQueryIDHeader: str(uuid.uuid4())})
         log.logger.debug(f"http headers {self.make_headers()}")
         try:
             resp_dict = self.do_query(url, query_sql)