From f13dfc437cda93fab7a4abba07a066b555ff6e01 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 5 Feb 2026 11:55:21 +0100
Subject: [PATCH] fix: refine subscription site count display logic and enhance
 active tab management in OrganizationSettings component

---
 app/page.tsx                                 | 2 +-
 components/settings/OrganizationSettings.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 4484d7f..9e8b8a9 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -305,7 +305,7 @@ export default function HomePage() {
               {(typeof subscription.sites_count === 'number' || (subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number')) && (
                 <p className="text-sm text-neutral-600 dark:text-neutral-400 mt-1">
                   {typeof subscription.sites_count === 'number' && (
-                    <span>Sites: {subscription.plan_id === 'solo' ? `${subscription.sites_count}/1` : subscription.sites_count}</span>
+                    <span>Sites: {subscription.plan_id === 'solo' && subscription.sites_count > 0 ? `${subscription.sites_count}/1` : subscription.sites_count}</span>
                   )}
                   {typeof subscription.sites_count === 'number' && subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && ' · '}
                   {subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && (
diff --git a/components/settings/OrganizationSettings.tsx b/components/settings/OrganizationSettings.tsx
index 930db7c..bf0f5ca 100644
--- a/components/settings/OrganizationSettings.tsx
+++ b/components/settings/OrganizationSettings.tsx
@@ -141,10 +141,10 @@ export default function OrganizationSettings() {
 
   useEffect(() => {
     const tab = searchParams.get('tab')
-    if (tab === 'billing' || tab === 'members') {
+    if ((tab === 'billing' || tab === 'members') && tab !== activeTab) {
       setActiveTab(tab)
     }
-  }, [searchParams])
+  }, [searchParams, activeTab])
 
   useEffect(() => {
     if (activeTab === 'billing' && currentOrgId) {