diff --git a/app/finders/text_search.rb b/app/finders/text_search.rb
index c7c3f9a98..5dfabca02 100644
--- a/app/finders/text_search.rb
+++ b/app/finders/text_search.rb
@@ -4,8 +4,7 @@ class TextSearch
   DEFAULT_STATUS = 'open'.freeze
 
   def initialize(current_user, params)
-    @current_user = current_user
-    @current_account = current_user.account
+    @current_account = current_user.account || Current.account
     @params = params
   end