diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 942dccb7..eec6977d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -259,7 +259,8 @@ class ProjectsController < ApplicationController
 					
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
-						:conditions => @query.statement
+						:conditions => @query.statement,
+						:limit => 500
 
     ic = Iconv.new('ISO-8859-1', 'UTF-8')    
     export = StringIO.new
@@ -313,7 +314,8 @@ class ProjectsController < ApplicationController
 					
     @issues =  Issue.find :all, :order => sort_clause,
 						:include => [ :author, :status, :tracker, :project, :custom_values ],
-						:conditions => @query.statement
+						:conditions => @query.statement,
+						:limit => 500
 											
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"