diff --git a/ChangeLog b/ChangeLog
index 4391495cb..c83b8e67f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $HeadURL$
 - bug #1712570 Deleting last record freezes
 - bug #1717339 Missing header when deleting a checked column,
   thanks to Michael Keck
+- bug #1717477 Warning on Query page when db is empty
 
 2.10.1.0 (2007-04-23)
 =====================
diff --git a/db_qbe.php b/db_qbe.php
index f57630f0b..c4f487865 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -100,6 +100,12 @@ if (!empty($TableList)) {
  */
 $tbl_result     = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
 $tbl_result_cnt = PMA_DBI_num_rows($tbl_result);
+if (0 == $tbl_result_cnt) {
+    echo '<div class="warning">' . $strNoTablesFound . '</div>';
+    require_once './libraries/footer.inc.php';
+    exit;
+}
+
 $i              = 0;
 $k              = 0;