diff --git a/ChangeLog b/ChangeLog
index cfaef239df..e2cf4cf217 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-15 Michal Čihař  <michal@cihar.com>
+    * tbl_properties_export.php: Fix export of queries with empty WHERE clause
+      (bug #990330).
+
 2004-07-15 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug 990959, undefined index for DATETIME
       field (problem in UTF-8 only!)
diff --git a/tbl_properties_export.php b/tbl_properties_export.php
index 9e261caad1..ec08e6df55 100644
--- a/tbl_properties_export.php
+++ b/tbl_properties_export.php
@@ -42,7 +42,7 @@ if (isset($sql_query)) {
             $sql_query .= $conj . '( ' . $key . ' ) ';
             $conj = 'OR ';
         }
-    } else {
+    } elseif (!empty($analyzed_sql[0]['where_clause']))  {
         $sql_query .= ' WHERE ' . $analyzed_sql[0]['where_clause'];
     }
     if (!empty($analyzed_sql[0]['group_by_clause'])) {