diff --git a/Templates/MSBuild/FlagTables/v140_CL.json b/Templates/MSBuild/FlagTables/v140_CL.json
index 58e22ba446..d479af2cdc 100644
--- a/Templates/MSBuild/FlagTables/v140_CL.json
+++ b/Templates/MSBuild/FlagTables/v140_CL.json
@@ -372,7 +372,7 @@
   },
   {
     "name": "EnableEnhancedInstructionSet",
-    "switch": "",
+    "switch": "arch:NotSet",
     "comment": "Not Set",
     "value": "NotSet",
     "flags": []
diff --git a/Templates/MSBuild/FlagTables/v141_CL.json b/Templates/MSBuild/FlagTables/v141_CL.json
index 604e6b6c87..d79ea90f79 100644
--- a/Templates/MSBuild/FlagTables/v141_CL.json
+++ b/Templates/MSBuild/FlagTables/v141_CL.json
@@ -393,7 +393,7 @@
   },
   {
     "name": "EnableEnhancedInstructionSet",
-    "switch": "",
+    "switch": "arch:NotSet",
     "comment": "Not Set",
     "value": "NotSet",
     "flags": []
diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json
index 4f2dce8c77..3c86e22fbb 100644
--- a/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/Templates/MSBuild/FlagTables/v142_CL.json
@@ -407,7 +407,7 @@
   },
   {
     "name": "EnableEnhancedInstructionSet",
-    "switch": "",
+    "switch": "arch:NotSet",
     "comment": "Not Set",
     "value": "NotSet",
     "flags": []
diff --git a/Templates/MSBuild/FlagTables/v143_CL.json b/Templates/MSBuild/FlagTables/v143_CL.json
index 119e171c2a..a6b60aad15 100644
--- a/Templates/MSBuild/FlagTables/v143_CL.json
+++ b/Templates/MSBuild/FlagTables/v143_CL.json
@@ -407,7 +407,7 @@
   },
   {
     "name": "EnableEnhancedInstructionSet",
-    "switch": "",
+    "switch": "arch:NotSet",
     "comment": "Not Set",
     "value": "NotSet",
     "flags": []