diff --git a/sql.php b/sql.php
index 850a70ca0f..7b18b1d10b 100644
--- a/sql.php
+++ b/sql.php
@@ -560,9 +560,6 @@ if ($GLOBALS['cfg']['RememberSorting']
     PMA_handleSortOrder($db, $table, $analyzed_sql, $full_sql_query);
 }
 
-$sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos']
-        . ', ' . $_SESSION['tmp_user_values']['max_rows'] . " ";
-
 // Do append a "LIMIT" clause?
 if (($_SESSION['tmp_user_values']['max_rows'] != 'all')
     && ! ($is_count || $is_export || $is_func || $is_analyse)
@@ -570,6 +567,8 @@ if (($_SESSION['tmp_user_values']['max_rows'] != 'all')
     && ! isset($analyzed_sql[0]['queryflags']['offset'])
     && empty($analyzed_sql[0]['limit_clause'])
 ) {
+    $sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos']
+        . ', ' . $_SESSION['tmp_user_values']['max_rows'] . " ";
     $full_sql_query = PMA_getSqlWithLimitClause(
         $full_sql_query,
         $analyzed_sql,
@@ -1517,6 +1516,8 @@ function getTableHtmlForMultipleQueries(
                 && ! isset($analyzed_sql[0]['queryflags']['offset'])
                 && empty($analyzed_sql[0]['limit_clause'])
             ) {
+                $sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos']
+        . ', ' . $_SESSION['tmp_user_values']['max_rows'] . " ";
                 $sql_data['valid_sql'][$sql_no] = PMA_getSqlWithLimitClause(
                     $sql_data['valid_sql'][$sql_no],
                     $analyzed_sql,