diff --git a/src/client/common/terminal/environmentActivationProviders/condaActivationProvider.ts b/src/client/common/terminal/environmentActivationProviders/condaActivationProvider.ts
index 72f1eb447dce..09dfc8ce5c92 100644
--- a/src/client/common/terminal/environmentActivationProviders/condaActivationProvider.ts
+++ b/src/client/common/terminal/environmentActivationProviders/condaActivationProvider.ts
@@ -87,7 +87,11 @@ export class CondaActivationCommandProvider implements ITerminalActivationComman
                 );
                 // eslint-disable-next-line camelcase
                 if (activatePath?.path) {
-                    if (this.platform.isWindows) {
+                    if (
+                        this.platform.isWindows &&
+                        targetShell !== TerminalShellType.bash &&
+                        targetShell !== TerminalShellType.gitbash
+                    ) {
                         return [activatePath.path, `conda activate ${condaEnv.toCommandArgumentForPythonExt()}`];
                     }
 
diff --git a/src/test/common/terminals/activation.conda.unit.test.ts b/src/test/common/terminals/activation.conda.unit.test.ts
index bd23ffc1f2a7..e26f09fd516a 100644
--- a/src/test/common/terminals/activation.conda.unit.test.ts
+++ b/src/test/common/terminals/activation.conda.unit.test.ts
@@ -332,7 +332,10 @@ suite('Terminal Environment Activation conda', () => {
                 componentAdapter.object,
             );
 
-            const activationCommands = await provider.getActivationCommands(undefined, TerminalShellType.bash);
+            const activationCommands = await provider.getActivationCommands(
+                undefined,
+                testParams.isWindows ? TerminalShellType.commandPrompt : TerminalShellType.bash,
+            );
 
             expect(activationCommands).to.deep.equal(testParams.expectedResult, 'Incorrect Activation command');
         });