diff --git a/resources/ts/Components/Integrations/Detail/Credentials.tsx b/resources/ts/Components/Integrations/Detail/Credentials.tsx
index e7c6f55eb..9af7cddf4 100644
--- a/resources/ts/Components/Integrations/Detail/Credentials.tsx
+++ b/resources/ts/Components/Integrations/Detail/Credentials.tsx
@@ -41,9 +41,10 @@ export const Credentials = ({
   const hasAnyCredentials = Boolean(
     legacyAuthConsumers.length || authClients.length
   );
+  const isKeyVisibilityV1 = keyVisibility === KeyVisibility.v1
   usePolling(
     !hasAnyCredentials ||
-      (keyVisibility === KeyVisibility.v1 && !!keyVisibilityUpgrade),
+      (isKeyVisibilityV1 && !!keyVisibilityUpgrade),
     { only: ["integration"] }
   );
   const credentials = useMemo(
diff --git a/resources/ts/Components/Integrations/Detail/CredentialsAuthClients.tsx b/resources/ts/Components/Integrations/Detail/CredentialsAuthClients.tsx
index 003d92c80..376cef6b2 100644
--- a/resources/ts/Components/Integrations/Detail/CredentialsAuthClients.tsx
+++ b/resources/ts/Components/Integrations/Detail/CredentialsAuthClients.tsx
@@ -36,6 +36,7 @@ export const CredentialsAuthClients = ({
   keyVisibilityUpgrade,
 }: Props) => {
   const { t } = useTranslation();
+  const isKeyVisibilityV1 = keyVisibility === KeyVisibility.v1;
 
   const auth0TestClientWithLabels = [
     {
@@ -69,8 +70,8 @@ export const CredentialsAuthClients = ({
       <Heading className="font-semibold lg:min-w-60" level={4}>
         {t("details.credentials.uitid_v2")}
       </Heading>
-      {keyVisibility === KeyVisibility.v1 ? (
-        keyVisibility === KeyVisibility.v1 && !!keyVisibilityUpgrade ? (
+      {isKeyVisibilityV1 ? (
+        isKeyVisibilityV1 && !!keyVisibilityUpgrade ? (
           <Alert variant="info">{t("integrations.pending_credentials")}</Alert>
         ) : (
           <div className="flex flex-col flex-1 gap-4">