diff --git a/src/components/LayoutSidebar.tsx b/src/components/LayoutSidebar.tsx
index 81daf577..33778995 100644
--- a/src/components/LayoutSidebar.tsx
+++ b/src/components/LayoutSidebar.tsx
@@ -97,8 +97,9 @@ export function LayoutSidebar({
         }
     }
 
+    const currentOrg = orgs.find((org) => org.orgId === orgId);
     const canShowProductUpdates =
-        user.serverAdmin || orgs[0]?.isOwner || orgs[0]?.isAdmin;
+        user.serverAdmin || Boolean(currentOrg?.isOwner || currentOrg?.isAdmin);
 
     return (
         <div