diff --git a/server/monitor-types/mssql.js b/server/monitor-types/mssql.js
index e4bd6ca85..444615263 100644
--- a/server/monitor-types/mssql.js
+++ b/server/monitor-types/mssql.js
@@ -28,7 +28,7 @@ class MssqlMonitorType extends MonitorType {
         }
 
         const conditions = ConditionExpressionGroup.fromMonitor(monitor);
-        const hasConditions = conditions && conditions.length > 0;
+        const hasConditions = conditions !== null;
 
         const startTime = dayjs().valueOf();
         try {
diff --git a/server/monitor-types/mysql.js b/server/monitor-types/mysql.js
index 7d9a9eb45..c5863d50b 100644
--- a/server/monitor-types/mysql.js
+++ b/server/monitor-types/mysql.js
@@ -29,7 +29,7 @@ class MysqlMonitorType extends MonitorType {
         const password = monitor.radiusPassword;
 
         const conditions = ConditionExpressionGroup.fromMonitor(monitor);
-        const hasConditions = conditions && conditions.length > 0;
+        const hasConditions = conditions !== null;
 
         const startTime = dayjs().valueOf();
         try {
diff --git a/test/backend-test/monitors/test-mssql.js b/test/backend-test/monitors/test-mssql.js
index e9289aa7b..37c050682 100644
--- a/test/backend-test/monitors/test-mssql.js
+++ b/test/backend-test/monitors/test-mssql.js
@@ -172,7 +172,7 @@ describe(
                 await assert.rejects(
                     mssqlMonitor.check(monitor, heartbeat, {}),
                     new Error(
-                        "Query result (99) did not meet the specified conditions"
+                        "Query result did not meet the specified conditions (99)"
                     )
                 );
                 assert.strictEqual(