diff --git a/ui/litellm-dashboard/src/components/organizations.tsx b/ui/litellm-dashboard/src/components/organizations.tsx
index 3b2eddef9d9..6bb78ccee02 100644
--- a/ui/litellm-dashboard/src/components/organizations.tsx
+++ b/ui/litellm-dashboard/src/components/organizations.tsx
@@ -459,12 +459,6 @@ const OrganizationsTable: React.FC<OrganizationsTableProps> = ({
             </Col>
             {(userRole === "Admin" || userRole === "Org Admin") && (
               <Col numColSpan={1}>
-                <Button
-                  className="mx-auto"
-                  onClick={() => setIsOrgModalVisible(true)}
-                >
-                  + Create New Organization
-                </Button>
                 <Modal
                   title="Create Organization"
                   visible={isOrgModalVisible}
diff --git a/ui/litellm-dashboard/src/components/teams.tsx b/ui/litellm-dashboard/src/components/teams.tsx
index 7e8271ef510..23e5c180d17 100644
--- a/ui/litellm-dashboard/src/components/teams.tsx
+++ b/ui/litellm-dashboard/src/components/teams.tsx
@@ -441,7 +441,7 @@ const Teams: React.FC<TeamProps> = ({
       <Grid numItems={1} className="gap-2 p-8 w-full mt-2">
         <Col numColSpan={1} className="flex flex-col gap-2">
         {
-          userRole == "Admin" || userRole == "Org Admin"? 
+          (userRole == "Admin" || userRole == "Org Admin") && !selectedTeamId? 
           <Button
             className="w-fit"
             onClick={() => setIsTeamModalVisible(true)}