diff --git a/system/src/Grav/Common/Markdown/Parsedown.php b/system/src/Grav/Common/Markdown/Parsedown.php
index 1db2d1707..f453a544a 100644
--- a/system/src/Grav/Common/Markdown/Parsedown.php
+++ b/system/src/Grav/Common/Markdown/Parsedown.php
@@ -5,9 +5,9 @@ class Parsedown extends \Parsedown
 {
     use ParsedownGravTrait;
 
-    public function __construct($page)
+    public function __construct($page, $defaults)
     {
-        $this->init($page);
+        $this->init($page, $defaults);
     }
 
 }
diff --git a/system/src/Grav/Common/Markdown/ParsedownExtra.php b/system/src/Grav/Common/Markdown/ParsedownExtra.php
index da20ca1e0..526e5f905 100644
--- a/system/src/Grav/Common/Markdown/ParsedownExtra.php
+++ b/system/src/Grav/Common/Markdown/ParsedownExtra.php
@@ -5,9 +5,9 @@ class ParsedownExtra extends \ParsedownExtra
 {
     use ParsedownGravTrait;
 
-    public function __construct($page)
+    public function __construct($page, $defaults)
     {
         parent::__construct();
-        $this->init($page);
+        $this->init($page, $defaults);
     }
 }
diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 3c478b103..927cf8a9d 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -26,8 +26,9 @@ trait ParsedownGravTrait
      * Initialiazation function to setup key variables needed by the MarkdownGravLinkTrait
      *
      * @param $page
+     * @param $defaults
      */
-    protected function init($page)
+    protected function init($page, $defaults)
     {
         $this->page = $page;
         $this->pages = self::getGrav()['pages'];
@@ -36,7 +37,9 @@ trait ParsedownGravTrait
         $this->pages_dir = self::getGrav()['locator']->findResource('page://');
         $this->special_chars = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
 
-        $defaults = self::getGrav()['config']->get('system.pages.markdown');
+        if ($defaults == null) {
+            $defaults = self::getGrav()['config']->get('system.pages.markdown');
+        }
 
         $this->setBreaksEnabled($defaults['auto_line_breaks']);
         $this->setUrlsLinked($defaults['auto_url_links']);
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 95b558f18..799ce6f83 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -442,9 +442,9 @@ class Page
 
         // Initialize the preferred variant of Parsedown
         if ($defaults['extra']) {
-            $parsedown = new ParsedownExtra($this);
+            $parsedown = new ParsedownExtra($this, $defaults);
         } else {
-            $parsedown = new Parsedown($this);
+            $parsedown = new Parsedown($this, $defaults);
         }
 
         $this->content = $parsedown->text($this->content);
diff --git a/system/src/Grav/Common/TwigExtension.php b/system/src/Grav/Common/TwigExtension.php
index 64ab73f66..cfec33ba7 100644
--- a/system/src/Grav/Common/TwigExtension.php
+++ b/system/src/Grav/Common/TwigExtension.php
@@ -337,9 +337,9 @@ class TwigExtension extends \Twig_Extension
 
         // Initialize the preferred variant of Parsedown
         if ($defaults['extra']) {
-            $parsedown = new ParsedownExtra($page);
+            $parsedown = new ParsedownExtra($page, $defaults);
         } else {
-            $parsedown = new Parsedown($page);
+            $parsedown = new Parsedown($page, $defaults);
         }
 
         $string = $parsedown->text($string);