diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f1dfa2b58..056d309e9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -484,7 +484,7 @@ class IssuesController < ApplicationController
   def retrieve_default_query(use_session)
     return if params[:query_id].present?
     return if api_request?
-    return if params[:set_filter] && (params.key?(:op) || params.key?(:f))
+    return if params[:set_filter]
 
     if params[:without_default].present?
       params[:set_filter] = 1
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index e775f6b10..da7259da1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -328,7 +328,7 @@ class ProjectsController < ApplicationController
   def retrieve_default_query
     return if params[:query_id].present?
     return if api_request?
-    return if params[:set_filter] && (params.key?(:op) || params.key?(:f))
+    return if params[:set_filter]
 
     if params[:without_default].present?
       params[:set_filter] = 1