diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 0520dfc1d..8cb2240f2 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -764,6 +764,10 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
         array_shift($_SESSION['sql_history']);
     }
 
+    if (! $cfgRelation['historywork']) {
+        return;
+    }
+
     PMA_query_as_cu('
          INSERT INTO
                 ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . '
@@ -802,6 +806,10 @@ function PMA_getHistory($username)
         return array_reverse($_SESSION['sql_history']);
     }
 
+    if (! $cfgRelation['historywork']) {
+        return false;
+    }
+
     $hist_query = '
          SELECT `db`,
                 `table`,
@@ -836,6 +844,10 @@ function PMA_purgeHistory($username)
         return;
     }
 
+    if (! $cfgRelation['historywork']) {
+        return;
+    }
+
     $search_query = '
          SELECT `timevalue`
            FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . '