diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
index f93ae3e56f..d7890d4764 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
@@ -294,17 +294,13 @@ const ApiTokenCreateView = () => {
           initialValues={{
             name: apiToken?.name || '',
             description: apiToken?.description || '',
-            type: apiToken?.type,
+            type: state.selectedActions.length > 0 && !apiToken?.type ? 'custom' : apiToken?.type,
             lifespan: apiToken?.lifespan,
           }}
           enableReinitialize
           onSubmit={(body, actions) => handleSubmit(body, actions)}
         >
           {({ errors, handleChange, isSubmitting, values }) => {
-            if (state.selectedActions.length > 0 && !values?.type) {
-              values.type = 'custom';
-            }
-
             return (
               <Form>
                 <HeaderLayout