diff --git a/saas/app/models/account/billing.rb b/saas/app/models/account/billing.rb
index 7d51b11a9..dada43721 100644
--- a/saas/app/models/account/billing.rb
+++ b/saas/app/models/account/billing.rb
@@ -31,8 +31,8 @@ module Account::Billing
     def active_subscription
       if comped?
         comped_subscription
-      else
-        subscription if subscription&.active?
+      elsif subscription&.active?
+        subscription
       end
     end