diff --git a/README.md b/README.md
index 263de2c0f..994d34fea 100644
--- a/README.md
+++ b/README.md
@@ -167,7 +167,7 @@ The following table lists all valid connection properties:
 | FILE_TRANSFER_MEMORY_THRESHOLD | No       | The maximum number of bytes to store in memory used in order to provide a file encryption. If encrypting/decrypting file size exceeds provided value a temporary file will be created and the work will be continued in the temporary file instead of memory. <br/> If no value provided 1MB will be used as a default value (that is 1048576 bytes). <br/> It is possible to configure any integer value bigger than zero representing maximal number of bytes to reside in memory.                                                                                                                                                                                                                                      |
 | CLIENT_CONFIG_FILE             | No       | The location of the client configuration json file. In this file you can configure easy logging feature.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | ALLOWUNDERSCORESINHOST         | No       | Specifies whether to allow underscores in account names. This impacts PrivateLink customers whose account names contain underscores. In this situation, you must override the default value by setting allowUnderscoresInHost to true.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| QUERY_TAG                      | No       | Optional string that can be used to tag queries and other SQL statements executed within a connection. The tags are displayed in the output of the QUERY_HISTORY , QUERY_HISTORY_BY_* functions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| QUERY_TAG                      | No       | Optional string that can be used to tag queries and other SQL statements executed within a connection. The tags are displayed in the output of the QUERY_HISTORY , QUERY_HISTORY_BY_* functions.<br/> To set QUERY_TAG on the statement level you can use SnowflakeDbCommand.QueryTag.                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 
 <br />
 
diff --git a/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs b/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
index a4c84caeb..3a3cfb82f 100755
--- a/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
+++ b/Snowflake.Data.Tests/IntegrationTests/SFDbCommandIT.cs
@@ -1624,5 +1624,25 @@ public void TestGetResultsOfUnknownQueryIdWithConfiguredRetry()
                 conn.Close();
             }
         }
+        
+        [Test]
+        public void TestSetQueryTagOverridesConnectionString()
+        {
+            using (var conn = new SnowflakeDbConnection())
+            {
+                string expectedQueryTag = "Test QUERY_TAG 12345";
+                string connectQueryTag = "Test 123";
+                conn.ConnectionString = ConnectionString + $";query_tag={connectQueryTag}";
+                
+                conn.Open();
+                var command = conn.CreateCommand();
+                ((SnowflakeDbCommand)command).QueryTag =  expectedQueryTag;
+                // This query itself will be part of the history and will have the query tag
+                command.CommandText = "SELECT QUERY_TAG FROM table(information_schema.query_history_by_session())";
+                var queryTag = command.ExecuteScalar();
+                
+                Assert.AreEqual(expectedQueryTag, queryTag);
+            }
+        }
     }
 }
diff --git a/Snowflake.Data/Client/SnowflakeDbCommand.cs b/Snowflake.Data/Client/SnowflakeDbCommand.cs
index 36a04f151..15d8e0870 100755
--- a/Snowflake.Data/Client/SnowflakeDbCommand.cs
+++ b/Snowflake.Data/Client/SnowflakeDbCommand.cs
@@ -54,6 +54,11 @@ public override int CommandTimeout
             get; set;
         }
 
+        public string QueryTag
+        {
+            get; set;
+        }
+
         public override CommandType CommandType
         {
             get
@@ -132,7 +137,7 @@ protected override DbConnection DbConnection
                 connection = sfc;
                 if (sfc.SfSession != null)
                 {
-                    sfStatement = new SFStatement(sfc.SfSession);
+                    sfStatement = new SFStatement(sfc.SfSession, QueryTag);
                 }
             }
         }
@@ -143,7 +148,7 @@ protected override DbParameterCollection DbParameterCollection
             {
                 return this.parameterCollection;
             }
-        } 
+        }
 
         protected override DbTransaction DbTransaction
         {
@@ -373,15 +378,15 @@ private static Dictionary<string, BindingDTO> convertToBindList(List<SnowflakeDb
 
                     if (parameter.Value.GetType().IsArray &&
                         // byte array and char array will not be treated as array binding
-                        parameter.Value.GetType().GetElementType() != typeof(char) && 
+                        parameter.Value.GetType().GetElementType() != typeof(char) &&
                         parameter.Value.GetType().GetElementType() != typeof(byte))
                     {
                         List<object> vals = new List<object>();
                         foreach(object val in (Array)parameter.Value)
                         {
-                            // if the user is using interface, SFDataType will be None and there will 
+                            // if the user is using interface, SFDataType will be None and there will
                             // a conversion from DbType to SFDataType
-                            // if the user is using concrete class, they should specify SFDataType. 
+                            // if the user is using concrete class, they should specify SFDataType.
                             if (parameter.SFDataType == SFDataType.None)
                             {
                                 Tuple<string, string> typeAndVal = SFDataConverter
@@ -392,7 +397,7 @@ private static Dictionary<string, BindingDTO> convertToBindList(List<SnowflakeDb
                             }
                             else
                             {
-                                bindingType = parameter.SFDataType.ToString(); 
+                                bindingType = parameter.SFDataType.ToString();
                                 vals.Add(SFDataConverter.csharpValToSfVal(parameter.SFDataType, val));
                             }
                         }
@@ -420,13 +425,13 @@ private static Dictionary<string, BindingDTO> convertToBindList(List<SnowflakeDb
             }
         }
 
-        private void SetStatement() 
+        private void SetStatement()
         {
             if (connection == null)
             {
                 throw new SnowflakeDbException(SFError.EXECUTE_COMMAND_ON_CLOSED_CONNECTION);
             }
-            
+
             var session = (connection as SnowflakeDbConnection).SfSession;
 
             // SetStatement is called when executing a command. If SfSession is null
@@ -434,7 +439,7 @@ private void SetStatement()
             if (session == null)
                 throw new SnowflakeDbException(SFError.EXECUTE_COMMAND_ON_CLOSED_CONNECTION);
 
-            this.sfStatement = new SFStatement(session);
+            this.sfStatement = new SFStatement(session, QueryTag);
         }
 
         private SFBaseResultSet ExecuteInternal(bool describeOnly = false, bool asyncExec = false)
diff --git a/Snowflake.Data/Core/SFStatement.cs b/Snowflake.Data/Core/SFStatement.cs
index ae5ecbf4e..787bfa5de 100644
--- a/Snowflake.Data/Core/SFStatement.cs
+++ b/Snowflake.Data/Core/SFStatement.cs
@@ -151,7 +151,14 @@ internal SFStatement(SFSession session)
             _restRequester = session.restRequester;
             _queryTag = session._queryTag;
         }
-
+        
+        internal SFStatement(SFSession session, string queryTag) 
+        {
+            SfSession = session;
+            _restRequester = session.restRequester;
+            _queryTag = queryTag ?? session._queryTag; 
+        }
+        
         internal string GetBindStage() => _bindStage;
 
         private void AssignQueryRequestId()