diff --git a/server/modules/filter/binlogfilter/binlogfilter.cc b/server/modules/filter/binlogfilter/binlogfilter.cc
index d25c24352..126909783 100644
--- a/server/modules/filter/binlogfilter/binlogfilter.cc
+++ b/server/modules/filter/binlogfilter/binlogfilter.cc
@@ -27,7 +27,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
         MXS_FILTER_VERSION,
         desc,
         "V1.0.0",
-        RCAP_TYPE_NONE,
+        RCAP_TYPE_STMT_OUTPUT,
         &BinlogFilter::s_object,
         NULL,
         NULL,
@@ -81,5 +81,5 @@ json_t* BinlogFilter::diagnostics_json() const
 // static
 uint64_t BinlogFilter::getCapabilities()
 {
-    return RCAP_TYPE_NONE;
+    return RCAP_TYPE_STMT_OUTPUT;
 }
diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc
index 31ebfaee2..6e13dd355 100644
--- a/server/modules/filter/binlogfilter/binlogfiltersession.cc
+++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc
@@ -135,6 +135,7 @@ int BinlogFilterSession::routeQuery(GWBUF* pPacket)
         // Connected client is using SQL mode
         m_state = COMMAND_MODE;
         m_reading_checksum = is_master_binlog_checksum(pPacket);
+        gwbuf_set_type(pPacket, GWBUF_TYPE_COLLECT_RESULT);
         break;
 
     default: