diff --git a/server/modules/filter/binlogfilter/binlogfiltersession.cc b/server/modules/filter/binlogfilter/binlogfiltersession.cc
index 912e27a50..31ebfaee2 100644
--- a/server/modules/filter/binlogfilter/binlogfiltersession.cc
+++ b/server/modules/filter/binlogfilter/binlogfiltersession.cc
@@ -403,13 +403,13 @@ static bool should_skip_query(const BinlogConfig& config, const std::string& sql
         }
 
         qc_free_table_names(names, n);
-    }
 
-    // Also check for the default database in case the query has no tables in it. The dot at the end is
-    // required to distinct database names from table names.
-    if (n == 0)
-    {
-        rval = should_skip(config, db + '.');
+        // Also check for the default database in case the query has no tables in it. The dot at the end is
+        // required to distinct database names from table names.
+        if (n == 0)
+        {
+            rval = should_skip(config, db + '.');
+        }
     }
 
     gwbuf_free(buf);