diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index a3fc7e435d56..db13e14e920e 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -144,7 +144,7 @@ public function display(): array
                 $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
                 $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
 
-                if (strpos($traceLine['file'], 'APPPATH') === false) {
+                if (strpos($traceLine['file'], 'SYSTEMPATH') !== false) {
                     continue;
                 }
                 $line = empty($line) ? $traceLine : $line;
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 80800ecbc94b..093ea6ca8aec 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -14,6 +14,7 @@ BREAKING
 
 Enhancements
 ============
+- Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
 
 Changes
 =======