diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 1bafc85d0c..d19de72d1b 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -13,7 +13,7 @@ Spree.user_class.class_eval do
 
   def known_users
     if admin?
-      Spree::User.all
+      Spree::User.scoped
     else
       Spree::User
       .includes(:enterprises)