diff --git a/src/EventHub.Web/Pages/Pricing.cshtml b/src/EventHub.Web/Pages/Pricing.cshtml
index 5aa1ed7..e6027ac 100644
--- a/src/EventHub.Web/Pages/Pricing.cshtml
+++ b/src/EventHub.Web/Pages/Pricing.cshtml
@@ -33,7 +33,7 @@
                                 <li><i class="fa fa-check-circle"></i> @additionalFeatureInfo </li>
                             }
                         </ul>
-                        @if (Model.Organization.PlanType == plan.PlanType && plan.Price > 0)
+                        @if (Model.Organization.PlanType == plan.PlanType && plan.Price > 0 && plan.IsExtendable)
                         {
                             <form id="Extend" method="post" asp-page-handler="Extend">
                                 <abp-input asp-for="TargetPlanToUpgrade" value="@plan.PlanType"></abp-input>
@@ -41,7 +41,7 @@
                                 <a onclick="document.getElementById('Extend').submit()" class="btn btn-info my-4"><i class="fas fa-crown me-2"></i> Extend Now</a>
                             </form>
                         }
-                        else if (plan.IsExtendable)
+                        else if (plan.Price > 0)
                         {
                             <form id="Upgrade-@plan.PlanType" method="post" asp-page-handler="Upgrade">
                                 <abp-input asp-for="TargetPlanToUpgrade" value="@plan.PlanType"></abp-input>