diff --git a/app/templates/components/billing/authorization.hbs b/app/templates/components/billing/authorization.hbs
index 802962c5fa..007315f0d6 100644
--- a/app/templates/components/billing/authorization.hbs
+++ b/app/templates/components/billing/authorization.hbs
@@ -45,7 +45,7 @@
   <span class="notice-banner--yellow" data-test-trial-running-out='true'>
     We are currently waiting for Stripe to finish processing your order.
   </span>
-{{else if (and this.isComplete (or this.subscription.isStripe this.subscription.isManual))}}
+{{else if (or this.subscription.isStripe this.subscription.isManual)}}
   {{#if (or this.showPlansSelector this.showAddonsSelector)}}
     {{#if (not this.isV2Subscription)}}
       <Billing::Process
@@ -86,7 +86,7 @@
           />
         </div>
         <div class='billing-subscription__buttons--addons'>
-          {{#if (and this.isV2Subscription this.canBuyAddons)}}
+          {{#if (and this.isV2Subscription this.canBuyAddons this.subscription.isSubscribed)}}
             <button {{on 'click' (fn (mut this.showAddonsSelector) true)}}  class='button--white-and-teal button--hover' data-test-buy-addons='true'>
               Buy addons
             </button>
diff --git a/app/templates/components/billing/summary-v2.hbs b/app/templates/components/billing/summary-v2.hbs
index 0f207b7e7a..b3268ae727 100644
--- a/app/templates/components/billing/summary-v2.hbs
+++ b/app/templates/components/billing/summary-v2.hbs
@@ -81,7 +81,7 @@
                   Unknown plan
                 {{/if}}
 
-                {{#if (eq this.subscription.plan.planType 'hybrid')}}
+                {{#if this.subscription.plan.planType}}
                   {{#if this.subscription.isSubscribed}}
                     <span class="badge green square" data-test-active-status='true'>
                       active