diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index 39b7a961..e0352be2 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -55,7 +55,7 @@ class ApplicationPolicy
     end
 
     def resolve
-      scope
+      scope.all
     end
   end
 end
diff --git a/app/policies/token_policy.rb b/app/policies/token_policy.rb
index 393d2441..79ab17ae 100644
--- a/app/policies/token_policy.rb
+++ b/app/policies/token_policy.rb
@@ -4,7 +4,7 @@ class TokenPolicy < ApplicationPolicy
       if user
         scope.where('tokens.user_id = ?', user.id)
       else
-        where(:id => nil).where("id IS NOT ?", nil) # to just return none
+        scope.where(:id => nil).where("id IS NOT ?", nil) # to just return none
       end
     end
   end