diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index e8e5cb0525..756232f184 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -917,10 +917,10 @@ class Tracker
                 // we want to track
                 $sql_query .=
                 " WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" .
-                " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
+                " AND `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname ?? '') . "' " .
                 " AND `table_name` = '"
                 . $GLOBALS['dbi']->escapeString($result['tablename']) . "' " .
-                " AND `version` = '" . $GLOBALS['dbi']->escapeString($version) . "' ";
+                " AND `version` = '" . $GLOBALS['dbi']->escapeString($version ?? '') . "' ";
 
                 $relation->queryAsControlUser($sql_query);
             }