diff --git a/HISTORY.rst b/HISTORY.rst
index 19b9b921..fd73bec5 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,6 +8,11 @@ PlatformIO Core 5
 
 **A professional collaborative platform for embedded development**
 
+5.0.4 (2020-??-??)
+~~~~~~~~~~~~~~~~~~
+
+- Do not provide "intelliSenseMode" option when generating configuration for VSCode C/C++ extension
+
 5.0.3 (2020-11-12)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
index dee165d4..806e5bc9 100644
--- a/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/c_cpp_properties.json.tpl
@@ -118,9 +118,6 @@
 % end
                 ""
             ],
-% if compiler_type == "gcc":
-            "intelliSenseMode": "gcc-x64",
-% end
 % if cc_stds:
             "cStandard": "c{{ cc_stds[-1] }}",
 % end