diff --git a/MarkdownPreview.sublime-settings b/MarkdownPreview.sublime-settings
index 2a2c11be..dd64536a 100644
--- a/MarkdownPreview.sublime-settings
+++ b/MarkdownPreview.sublime-settings
@@ -77,7 +77,11 @@
         "markdown.extensions.def_list",
         "markdown.extensions.tables",
         "markdown.extensions.abbr",
-        "markdown.extensions.codehilite",
+        {
+            "markdown.extensions.codehilite": {
+                "guess_lang": false
+            }
+        },
         // Extra's Markdown parsing in raw HTML cannot be
         // included by itself, but "pymdownx" exposes it so we can.
         "pymdownx.extrarawhtml",
diff --git a/docs/src/markdown/changes.md b/docs/src/markdown/changes.md
index 4285c98f..2d9a17d1 100644
--- a/docs/src/markdown/changes.md
+++ b/docs/src/markdown/changes.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 2.0.2
+
+- Code highlighting should have guessing disabled by default.
+- Fix failure when code highlighting has guessing enabled, but the user specified a language name which has no lexer.
+
 ## 2.0.1
 
 - Fix missing code highlight extension.