diff --git a/ChangeLog b/ChangeLog
index 5a3a5c078..de1e09b28 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ $Source$
       is deprecated and no longer works on sourceforge, use j
     * lang/french.inc.php3 updates
     * user_password.php3 parse error as reported by Olivier
+    * libraries/relation.lib.php3: pmadb can be left blank
 
 2002-06-16 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/sync_lang.sh: new script thanks to Michal Cihar
diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3
index a5d86df5c..91c78da6d 100644
--- a/libraries/relation.lib.php3
+++ b/libraries/relation.lib.php3
@@ -60,7 +60,9 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
         $cfgRelation['commwork']    = FALSE;
 
         // No server selected -> no bookmark table
-        if ($server == 0) {
+        if ($server == 0 
+           || !isset($GLOBALS['cfg']['Server']['pmadb'])
+           || empty($GLOBALS['cfg']['Server']['pmadb'])) {
             return '';
         }