diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index 3be29f1a2..621c497d2 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -418,14 +418,27 @@ static skygw_query_type_t resolve_query_type(
          * PRELOAD_KEYS, FLUSH, RESET, CREATE|ALTER|DROP SERVER
          */
         if (sql_command_flags[lex->sql_command] & CF_AUTO_COMMIT_TRANS) {
-            qtype =  QUERY_TYPE_SESSION_WRITE;
-            goto return_here;
+                if (lex->option_type == OPT_GLOBAL)
+                {
+                        qtype = QUERY_TYPE_GLOBAL_WRITE;
+                }
+                else
+                {
+                        qtype =  QUERY_TYPE_SESSION_WRITE;
+                }
+                goto return_here;
         }
         
         /** Try to catch session modifications here */
         switch (lex->sql_command) {
-            case SQLCOM_CHANGE_DB:
             case SQLCOM_SET_OPTION:
+                if (lex->option_type == OPT_GLOBAL)
+                {
+                    qtype = QUERY_TYPE_GLOBAL_WRITE;
+                    break;
+                }
+                /**<! fall through */
+            case SQLCOM_CHANGE_DB:
                 qtype = QUERY_TYPE_SESSION_WRITE;
                 break;
 
diff --git a/query_classifier/query_classifier.h b/query_classifier/query_classifier.h
index dfd40c73e..71d567a13 100644
--- a/query_classifier/query_classifier.h
+++ b/query_classifier/query_classifier.h
@@ -33,7 +33,8 @@ typedef enum {
     QUERY_TYPE_LOCAL_READ,   /*!< Read non-database data, execute in MaxScale */
     QUERY_TYPE_READ,         /*!< No updates */
     QUERY_TYPE_WRITE,        /*!< Master data will be  modified */
-    QUERY_TYPE_SESSION_WRITE /*!< Session data will be modified */
+    QUERY_TYPE_SESSION_WRITE,/*!< Session data will be modified */
+    QUERY_TYPE_GLOBAL_WRITE  /*!< Global system variable modification */
 } skygw_query_type_t;