diff --git a/app/models/list.rb b/app/models/list.rb
index d4915f56fa..bb7dd4cfc0 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -34,7 +34,7 @@ class List < ApplicationRecord
   private
 
   def validate_account_lists_limit
-    errors.add(:base, I18n.t('lists.errors.limit')) if account.lists.count >= PER_ACCOUNT_LIMIT
+    errors.add(:base, I18n.t('lists.errors.limit')) if account.owned_lists.count >= PER_ACCOUNT_LIMIT
   end
 
   def clean_feed_manager
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 62a84dfebf..48c273d3ec 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -11,7 +11,11 @@ RSpec.describe List do
     context 'when account has hit max list limit' do
       let(:account) { Fabricate :account }
 
-      before { stub_const 'List::PER_ACCOUNT_LIMIT', 0 }
+      before do
+        stub_const 'List::PER_ACCOUNT_LIMIT', 1
+
+        Fabricate(:list, account: account)
+      end
 
       context 'when creating a new list' do
         it { is_expected.to_not allow_value(account).for(:account).against(:base).with_message(I18n.t('lists.errors.limit')) }