diff --git a/src/session.ts b/src/session.ts
index 792bf3a026..2a496daeea 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -324,10 +324,12 @@ export class SessionManager implements Middleware {
     private async migrateWhitespaceAroundPipeSetting() {
         const configuration = vscode.workspace.getConfiguration(utils.PowerShellLanguageId);
         const deprecatedSetting = 'codeFormatting.whitespaceAroundPipe'
-        if (configuration.has(deprecatedSetting) && !configuration.has('codeFormatting.addWhitespaceAroundPipe')) {
+        const newSetting = 'codeFormatting.addWhitespaceAroundPipe'
+        const configurationTargetOfNewSetting = await Settings.getEffectiveConfigurationTarget(newSetting);
+        if (configuration.has(deprecatedSetting) && configurationTargetOfNewSetting === null) {
             const configurationTarget = await Settings.getEffectiveConfigurationTarget(deprecatedSetting);
             const value = configuration.get(deprecatedSetting, configurationTarget)
-            await Settings.change('codeFormatting.addWhitespaceAroundPipe', value, configurationTarget);
+            await Settings.change(newSetting, value, configurationTarget);
         }
     }