diff --git a/data/SugarBean.php b/data/SugarBean.php
index 359e3a0743b..f3527a39432 100755
--- a/data/SugarBean.php
+++ b/data/SugarBean.php
@@ -4280,8 +4280,10 @@ public function process_list_query($query, $row_offset, $limit = -1, $max_per_pa
             }
         } else {
             if ((empty($limit) || $limit == -1)) {
-                $limit = $max_per_page + 1;
-                $max_per_page = $limit;
+                if ($max_per_page !== -99) {
+                    $limit = $max_per_page + 1;
+                    $max_per_page = $limit;
+                }
             }
         }