diff --git a/app/__init__.py b/app/__init__.py
index 0027e4e..afa61bc 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -34,7 +34,7 @@ app.config["FLATPAGES_EXTENSION_CONFIG"] = {
 	"fenced_code": {},
 	"tables": {},
 	"codehilite": {
-		"linenums": "True"
+		"guess_lang": False,
 	}
 }
 app.config.from_pyfile(os.environ["FLASK_CONFIG"])
diff --git a/app/utils/markdown.py b/app/utils/markdown.py
index bdf225d..b8b8d06 100644
--- a/app/utils/markdown.py
+++ b/app/utils/markdown.py
@@ -71,7 +71,9 @@ def render_markdown(source):
 def init_app(app):
 	global md
 
-	md = Markdown(extensions=app.config["FLATPAGES_MARKDOWN_EXTENSIONS"], output_format="html5")
+	md = Markdown(extensions=app.config["FLATPAGES_MARKDOWN_EXTENSIONS"],
+			extension_configs=app.config["FLATPAGES_EXTENSION_CONFIG"],
+			output_format="html5")
 
 	@app.template_filter()
 	def markdown(source):