diff --git a/ChangeLog b/ChangeLog
index 1042bdaab1..d1df52bbfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
 4.1.6.0 (not yet released)
 - bug #4232 User not found after creating the user
 - bug #4241 Confusing dialog when trying to create an already existing user
+- bug #4239 Missing LIMIT clause for some queries
 
 4.1.5.0 (2014-01-17)
 - bug #3780 Allow aborting loading pages
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 8943f7110f..9bdadfa4b5 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -832,9 +832,7 @@ function PMA_isAppendLimitClause($analyzed_sql_results)
         $analyzed_sql_results['analyzed_sql'][0]['queryflags']['select_from']
     );
     if (($_SESSION['tmpval']['max_rows'] != 'all')
-        && ! ($analyzed_sql_results['is_count']
-        || $analyzed_sql_results['is_export']
-        || $analyzed_sql_results['is_func']
+        && ! ($analyzed_sql_results['is_export']
         || $analyzed_sql_results['is_analyse'])
         && $select_from
         && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['offset'])