diff --git a/web/src/cde-gitness/pages/GitspaceCreate/CDECreateGitspace.tsx b/web/src/cde-gitness/pages/GitspaceCreate/CDECreateGitspace.tsx
index 5fe272e5d..6f57e4a88 100644
--- a/web/src/cde-gitness/pages/GitspaceCreate/CDECreateGitspace.tsx
+++ b/web/src/cde-gitness/pages/GitspaceCreate/CDECreateGitspace.tsx
@@ -151,7 +151,7 @@ export const CDECreateGitspace = () => {
         ...includeQueryParams,
         metadata: { infraProvider: 'HARNESS_GCP' }
       }}
-      validationSchema={validateGitnessForm(getString)}
+      validationSchema={validateGitnessForm(getString, true)}
       formName="importRepoForm"
       enableReinitialize>
       {formik => {
diff --git a/web/src/cde-gitness/pages/GitspaceCreate/GitspaceCreate.utils.ts b/web/src/cde-gitness/pages/GitspaceCreate/GitspaceCreate.utils.ts
index 5e659eac9..3f14a96fe 100644
--- a/web/src/cde-gitness/pages/GitspaceCreate/GitspaceCreate.utils.ts
+++ b/web/src/cde-gitness/pages/GitspaceCreate/GitspaceCreate.utils.ts
@@ -18,7 +18,7 @@ import * as yup from 'yup'
 import type { UseStringsReturn } from 'framework/strings'
 import { IDEType } from 'cde-gitness/constants'
 
-export const validateGitnessForm = (getString: UseStringsReturn['getString']) =>
+export const validateGitnessForm = (getString: UseStringsReturn['getString'], isCDE = false) =>
   yup.object().shape({
     branch: yup.string().trim().required(getString('cde.branchValidationMessage')),
     code_repo_url: yup.string().trim().required(getString('cde.repoValidationMessage')),
@@ -27,7 +27,7 @@ export const validateGitnessForm = (getString: UseStringsReturn['getString']) =>
     resource_identifier: yup.string().trim().required(getString('cde.machineValidationMessage')),
     name: yup.string().trim().required(),
     ssh_token_identifier: yup.string().when('ide', {
-      is: IDEType.VSCODE,
+      is: ide => ide === IDEType.VSCODE && isCDE,
       then: yup.string().required(getString('cde.sshValidationMessage'))
     })
   })