diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dfede56..93b3436a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.8.6
+## mm/dd/2018
+
+1. [](#bugfix)
+    * Force `html` for markdown preview [grav#2066](https://github.com/getgrav/grav/issues/2066)
+
 # v1.8.5
 ## 06/20/2018
 
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 300f6b75..383c6e6c 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -1863,6 +1863,7 @@ class AdminController extends AdminBaseController
 
             $this->preparePage($page, true);
             $page->header();
+            $page->templateFormat('html');
 
             // Add theme template paths to Twig loader
             $template_paths = $this->grav['locator']->findResources('theme://templates');