diff --git a/mysqltuner.pl b/mysqltuner.pl
index c5ba5cc..c24bece 100755
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -239,6 +239,9 @@ my $end  = ( $opt{nocolor} == 0 ) ? "\e[0m"              : "";
 # Checks for supported or EOL'ed MySQL versions
 my ( $mysqlvermajor, $mysqlverminor, $mysqlvermicro );
 
+# Database
+my @dblist;
+
 # Super structure containing all information
 my %result;
 $result{'MySQLTuner'}{'version'} = $tunerversion;
@@ -5850,8 +5853,8 @@ sub mysql_databases {
         return;
     }
 
-    my @dblist = select_array(
-"SELECT DISTINCT TABLE_SCHEMA FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );"
+    @dblist = select_array(
+"SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );"
     );
     infoprint "There is " . scalar(@dblist) . " Database(s).";
     my @totaldbinfo = split /\s/,
@@ -6028,9 +6031,6 @@ sub mysql_tables {
     if (mysql_version_ge(8) and not mysql_version_eq(10)) {
         infoprint "MySQL and Percona version 8 and greater have remove PROCEDURE ANALYSE feature"
     }
-    my @dblist = select_array(
-"SELECT DISTINCT TABLE_SCHEMA FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ( 'mysql', 'performance_schema', 'information_schema', 'sys' );"
-    );
     foreach (@dblist) {
         my $dbname = $_;
         next unless defined $_;