diff --git a/apps/studio/components/interfaces/Settings/API/JWTSettings.tsx b/apps/studio/components/interfaces/Settings/API/JWTSettings.tsx
index 56b739eee9d..001bbe4cdb8 100644
--- a/apps/studio/components/interfaces/Settings/API/JWTSettings.tsx
+++ b/apps/studio/components/interfaces/Settings/API/JWTSettings.tsx
@@ -225,9 +225,10 @@ const JWTSettings = () => {
                                   A random secret will be created, or you can create your own.
                                 </p>
                                 <p className="text-sm opacity-50">
-                                  This will invalidate all existing API keys, including your{' '}
+                                  This will invalidate your{' '}
                                   <code className="text-xs">service_role</code> and{' '}
-                                  <code className="text-xs">anon</code> keys.
+                                  <code className="text-xs">anon</code> API keys, and sign out all
+                                  users authenticated through Supabase Auth.
                                 </p>
                               </div>
                               <div className="flex flex-col items-end">
@@ -247,7 +248,7 @@ const JWTSettings = () => {
                                       },
                                     }}
                                   >
-                                    Generate new API Keys
+                                    Generate a random secret
                                   </ButtonTooltip>
                                 ) : (
                                   <DropdownMenu>
diff --git a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
index 5e7b83d3c39..47aded807d3 100644
--- a/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
+++ b/apps/studio/components/ui/ProjectSettings/DisplayApiSettings.tsx
@@ -149,7 +149,7 @@ const DisplayApiSettings = ({
                       (legacy ? 'Prefer using Secret API keys instead.' : '')
                 }
               />
-              {true && x.tags === 'service_role' && (
+              {hasServiceRoleKeyLeak && x.tags === 'service_role' && (
                 <Alert_Shadcn_ variant="destructive" className="my-4">
                   <WarningIcon />
                   <AlertTitle_Shadcn_>Urgent: Service Role key leak detected</AlertTitle_Shadcn_>