diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e1a3d860c0..69a947b031 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -40,7 +40,8 @@ class IssuesController < ApplicationController
   helper :timelog
 
   def index
-    retrieve_query
+    use_session = !request.format.csv?
+    retrieve_query(IssueQuery, use_session)
 
     if @query.valid?
       respond_to do |format|
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 901907347c..fa646aadfe 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -803,6 +803,18 @@ class IssuesControllerTest < Redmine::ControllerTest
     end
   end
 
+  def test_index_csv_should_not_set_session_query
+    original_value = session[:issue_query] = {:id=>4, :project_id=>1}
+    get :index, :params => {
+        :project_id => 1,
+        :query_id => 5,
+        :format => 'csv'
+      }
+    assert_response :success
+    assert_kind_of Hash, session[:issue_query]
+    assert_equal original_value, session[:issue_query]
+  end
+
   def test_index_pdf
     ["en", "zh", "zh-TW", "ja", "ko"].each do |lang|
       with_settings :default_language => lang do