diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index dcc693f50..73e332617 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -642,8 +642,7 @@ class ApplicationController < ActionController::Base
   # Rescues an invalid query statement. Just in case...
   def query_statement_invalid(exception)
     logger.error "Query::StatementInvalid: #{exception.message}" if logger
-    session.delete(:query)
-    sort_clear if respond_to?(:sort_clear)
+    session.delete(:issue_query)
     render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
   end