diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index 4353cbc99..6c4141cd8 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -774,9 +774,8 @@ static uint32_t resolve_query_type(parsing_info_t* pi, THD* thd)
         if (set_autocommit_stmt == 1)
         {
             type |= QUERY_TYPE_ENABLE_AUTOCOMMIT;
+            type |= QUERY_TYPE_COMMIT;
         }
-
-        type |= QUERY_TYPE_COMMIT;
     }
 
     if (set_autocommit_stmt == 0)
diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc
index 177d3c031..44efd63c2 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@@ -1550,7 +1550,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_ALTER;
     }
 
@@ -1568,7 +1568,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
 
         update_names_from_srclist(NULL, pSrcList);
 
@@ -1600,7 +1600,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
 
         if (pTableName)
         {
@@ -1650,7 +1650,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_CREATE;
 
         if (pTblName)
@@ -1679,7 +1679,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_CREATE;
 
         const Token* pName = pName2->z ? pName2 : pName1;
@@ -1792,7 +1792,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_DROP;
 
         update_names_from_srclist(NULL, pTable);
@@ -1807,10 +1807,6 @@ public:
 
         m_status = QC_QUERY_PARSED;
         m_type_mask = QUERY_TYPE_WRITE;
-        if (!isTemp)
-        {
-            m_type_mask |= QUERY_TYPE_COMMIT;
-        }
         m_operation = QUERY_OP_DROP;
         if (!isView)
         {
@@ -1949,10 +1945,6 @@ public:
         {
             m_type_mask |= QUERY_TYPE_CREATE_TMP_TABLE;
         }
-        else
-        {
-            m_type_mask |= QUERY_TYPE_COMMIT;
-        }
 
         const Token* pName = pName2->z ? pName2 : pName1;
         const Token* pDatabase = pName2->z ? pName1 : NULL;
@@ -2095,7 +2087,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_ALTER;
 
         switch (command)
@@ -2143,7 +2135,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
 
         update_names_from_srclist(NULL, pTables);
 
@@ -2245,7 +2237,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_DROP;
 
         switch (what)
@@ -2380,7 +2372,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
     }
 
     void maxscaleHandler(Parse* pParse, mxs_handler_t type, SrcList* pFullName, Token* pName)
@@ -2505,7 +2497,7 @@ public:
             {
             case TK_ALTER:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 m_operation = QUERY_OP_ALTER;
                 break;
 
@@ -2530,7 +2522,7 @@ public:
 
             case TK_CREATE:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 m_operation = QUERY_OP_CREATE;
                 break;
 
@@ -2548,7 +2540,7 @@ public:
 
             case TK_DROP:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 m_operation = QUERY_OP_DROP;
                 break;
 
@@ -2565,7 +2557,7 @@ public:
 
             case TK_GRANT:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 m_operation = QUERY_OP_GRANT;
                 break;
 
@@ -2598,13 +2590,13 @@ public:
 
             case TK_REVOKE:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 m_operation = QUERY_OP_REVOKE;
                 break;
 
             case TK_RESET:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 break;
 
             case TK_SELECT:
@@ -2643,7 +2635,7 @@ public:
 
             case TK_TRUNCATE:
                 m_status = QC_QUERY_TOKENIZED;
-                m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                m_type_mask = QUERY_TYPE_WRITE;
                 break;
 
             case TK_XA:
@@ -2665,7 +2657,7 @@ public:
                 if (m_keyword_2 == TK_TABLE)
                 {
                     m_status = QC_QUERY_TOKENIZED;
-                    m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                    m_type_mask = QUERY_TYPE_WRITE;
                 }
                 break;
 
@@ -2690,7 +2682,7 @@ public:
                 if (m_keyword_2 == TK_TABLE)
                 {
                     m_status = QC_QUERY_TOKENIZED;
-                    m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+                    m_type_mask = QUERY_TYPE_WRITE;
                 }
                 break;
 
@@ -2740,7 +2732,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT;
+        m_type_mask = QUERY_TYPE_WRITE;
 
         for (int i = 0; i < pTables->nSrc; ++i)
         {
@@ -2826,7 +2818,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
 
         switch (kind)
         {
@@ -2852,7 +2844,7 @@ public:
         switch (what)
         {
         case MXS_RESET_QUERY_CACHE:
-            m_type_mask = (QUERY_TYPE_SESSION_WRITE | QUERY_TYPE_COMMIT);
+            m_type_mask = QUERY_TYPE_SESSION_WRITE;
             break;
 
         default:
@@ -3123,7 +3115,7 @@ public:
         mxb_assert(this_thread.initialized);
 
         m_status = QC_QUERY_PARSED;
-        m_type_mask = (QUERY_TYPE_WRITE | QUERY_TYPE_COMMIT);
+        m_type_mask = QUERY_TYPE_WRITE;
         m_operation = QUERY_OP_TRUNCATE;
 
         char* zDatabase;
diff --git a/query_classifier/test/expected.sql b/query_classifier/test/expected.sql
index 55a350bd2..ce7ec5ff2 100644
--- a/query_classifier/test/expected.sql
+++ b/query_classifier/test/expected.sql
@@ -2,7 +2,7 @@ QUERY_TYPE_READ
 QUERY_TYPE_READ
 QUERY_TYPE_WRITE
 QUERY_TYPE_WRITE
-QUERY_TYPE_WRITE|QUERY_TYPE_COMMIT
+QUERY_TYPE_WRITE
 QUERY_TYPE_WRITE|QUERY_TYPE_CREATE_TMP_TABLE
 QUERY_TYPE_READ|QUERY_TYPE_SYSVAR_READ
 QUERY_TYPE_READ|QUERY_TYPE_USERVAR_READ