diff --git a/src/mocks/resolvers/service-accounts.js b/src/mocks/resolvers/service-accounts.js
index 8e26afaea..9283848be 100644
--- a/src/mocks/resolvers/service-accounts.js
+++ b/src/mocks/resolvers/service-accounts.js
@@ -157,6 +157,29 @@ asdf0jas0dfja0sdfj0as9dfja0sd9fj09sdfj0asjdf0as9jf09asjf0a9sjfa0s9djf0asdjf0asdj
           isApproved: true,
           isIssued: true,
         },
+        {
+          id: '888',
+          name: 'ialdkfjasd0f',
+          active: true,
+          application: {
+            name: 'Shoppers Drug Mart 888',
+          },
+          productEnvironment: {
+            id: '175',
+            name: 'dev',
+            flow: 'client-credentials',
+            product: {
+              id: '166',
+              name: 'Demo App',
+            },
+            credentialIssuer: {
+              clientAuthenticator: 'client-secret',
+            },
+          },
+          isComplete: true,
+          isApproved: true,
+          isIssued: true,
+        },
       ],
     })
   );
diff --git a/src/nextapp/components/access-list/access-list-row.tsx b/src/nextapp/components/access-list/access-list-row.tsx
index 03c00ef75..b55cb1c1a 100644
--- a/src/nextapp/components/access-list/access-list-row.tsx
+++ b/src/nextapp/components/access-list/access-list-row.tsx
@@ -114,16 +114,16 @@ const AccessListRow: React.FC<AccessListRowProps> = ({
               'kong-api-key-only',
               'kong-api-key-acl',
               'client-credentials',
-            ].includes(data.productEnvironment.flow) ||
-              (data.productEnvironment?.credentialIssuer
-                ?.clientAuthenticator === 'client-secret' && (
+            ].includes(data.productEnvironment.flow) &&
+              data.productEnvironment?.credentialIssuer?.clientAuthenticator ===
+                'client-secret' && (
                 <MenuItem
                   data-testid="regenerate-credentials-btn"
                   onClick={onOpen}
                 >
                   Regenerate Credentials
                 </MenuItem>
-              ))}
+              )}
             {data.productEnvironment?.credentialIssuer?.clientAuthenticator ===
               'client-jwt-jwks-url' &&
               controls.jwksUrl && (