diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 24b4082b048263..fc50555d07c236 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -44,9 +44,9 @@ parameters:
       - Product
       - CI
   - name: VSCODE_BUILD_TITLE_PREFIX
-    displayName: "Build title prefix"
+    displayName: "Build Title Prefix"
     type: string
-    default: ''
+    default: none
   - name: NPM_REGISTRY
     displayName: "Custom NPM Registry"
     type: string
@@ -139,6 +139,11 @@ parameters:
     default: auto
 
 variables:
+  - name: VSCODE_BUILD_TITLE_PREFIX
+    ${{ if eq(parameters.VSCODE_BUILD_TITLE_PREFIX, 'none') }}:
+      value: ""
+    ${{ else }}:
+      value: ${{ parameters.VSCODE_BUILD_TITLE_PREFIX }}
   - name: VSCODE_PRIVATE_BUILD
     value: ${{ ne(variables['Build.Repository.Uri'], 'https://github.com/microsoft/vscode.git') }}
   - name: NPM_REGISTRY
@@ -221,7 +226,7 @@ variables:
   - name: ARTIFACT_PREFIX
     value: ''
 
-name: "${{ parameters.VSCODE_BUILD_TITLE_PREFIX }}$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
+name: "$(VSCODE_BUILD_TITLE_PREFIX)$(Date:yyyyMMdd).$(Rev:r) (${{ parameters.VSCODE_QUALITY }})"
 
 resources:
   repositories: