diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index de7da9497e..b2fa712d00 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -107,7 +107,7 @@ module Spree
 
     # -- Scopes
     scope :not_empty, -> {
-      joins(:line_items).group(:id).having("count(spree_line_items.id) > 0")
+      left_outer_joins(:line_items).where.not(spree_line_items: { id: nil })
     }
 
     scope :managed_by, lambda { |user|
diff --git a/spec/services/search_orders_spec.rb b/spec/services/search_orders_spec.rb
index 8a51c5295a..e4b543aacd 100644
--- a/spec/services/search_orders_spec.rb
+++ b/spec/services/search_orders_spec.rb
@@ -16,7 +16,7 @@ describe SearchOrders do
     let(:service) { SearchOrders.new(params, enterprise_user) }
 
     it 'returns orders' do
-      expect(service.orders.count.length).to eq 3
+      expect(service.orders.count).to eq 3
     end
   end
 end