diff --git a/server/core/queryclassifier.cc b/server/core/queryclassifier.cc
index 71f6ce5c3..b1a6e7a85 100644
--- a/server/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@@ -1108,7 +1108,7 @@ QueryClassifier::RouteInfo QueryClassifier::update_route_info(
 
         process_routing_hints(pBuffer->hint, &route_target);
 
-        if (route_target == TARGET_SLAVE)
+        if (route_target == TARGET_SLAVE && command == MXS_COM_QUERY)
         {
             const QC_FUNCTION_INFO* infos = nullptr;
             size_t n_infos = 0;