diff --git a/saas/app/models/account/billing.rb b/saas/app/models/account/billing.rb
index 69c033817..be938701d 100644
--- a/saas/app/models/account/billing.rb
+++ b/saas/app/models/account/billing.rb
@@ -24,6 +24,6 @@ module Account::Billing
   end
 
   def exceeding_card_limit?
-    cards_count > plan.card_limit
+    plan.limit_cards? && cards_count > plan.card_limit
   end
 end