diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
index d943c567fe..3220217f52 100644
--- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx
+++ b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
@@ -67,7 +67,7 @@ export const CreateANewTeamForm = () => {
         <div className="mb-8">
           {serverErrorMessage && (
             <div className="mb-4">
-              <Alert severity="error" message={serverErrorMessage} />
+              <Alert severity="error" message={t(serverErrorMessage)} />
             </div>
           )}
 
diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/packages/features/ee/teams/components/TeamsListing.tsx
index 6560880f9e..cbfed7c919 100644
--- a/packages/features/ee/teams/components/TeamsListing.tsx
+++ b/packages/features/ee/teams/components/TeamsListing.tsx
@@ -46,6 +46,8 @@ export function TeamsListing() {
   const teams = useMemo(() => data?.filter((m) => m.accepted) || [], [data]);
   const invites = useMemo(() => data?.filter((m) => !m.accepted) || [], [data]);
 
+  const isCreateTeamButtonDisabled = user?.organizationId && !user?.organization?.isOrgAdmin;
+
   const features = [
     {
       icon: <Users className="h-5 w-5 text-red-500" />,
@@ -95,7 +97,7 @@ export function TeamsListing() {
 
       {invites.length > 0 && (
         <div className="bg-subtle mb-6 rounded-md p-5">
-          <Label className=" text-emphasis pb-2 font-semibold">{t("pending_invites")}</Label>
+          <Label className="text-emphasis pb-2  font-semibold">{t("pending_invites")}</Label>
           <TeamList teams={invites} pending />
         </div>
       )}
@@ -131,7 +133,11 @@ export function TeamsListing() {
             buttonRaw={
               <Button
                 color="secondary"
-                href={`${WEBAPP_URL}/settings/teams/new?returnTo=${WEBAPP_URL}/teams`}>
+                disabled={!!isCreateTeamButtonDisabled}
+                tooltip={
+                  isCreateTeamButtonDisabled ? t("org_admins_can_create_new_teams") : t("create_new_team")
+                }
+                onClick={() => router.push(`${WEBAPP_URL}/settings/teams/new?returnTo=${WEBAPP_URL}/teams`)}>
                 {t(`create_new_team`)}
               </Button>
             }