diff --git a/src/flextype/Support/Parsers/Markdown.php b/src/flextype/Support/Parsers/Markdown.php
index e49865a7..1c4714db 100644
--- a/src/flextype/Support/Parsers/Markdown.php
+++ b/src/flextype/Support/Parsers/Markdown.php
@@ -55,6 +55,9 @@ final class Markdown
     protected function __construct()
     {
         $this->markdownFacade = new ParsedownExtra();
+        $this->markdownFacade->setBreaksEnabled(flextype('registry')->get('flextype.settings.markdown.auto_line_breaks'));
+        $this->markdownFacade->setUrlsLinked(flextype('registry')->get('flextype.settings.markdown.auto_url_links'));
+        $this->markdownFacade->setMarkupEscaped(flextype('registry')->get('flextype.settings.markdown.escape_markup'));
     }
 
     /**
diff --git a/src/flextype/dependencies.php b/src/flextype/dependencies.php
index 016ba5a8..177c753f 100644
--- a/src/flextype/dependencies.php
+++ b/src/flextype/dependencies.php
@@ -220,10 +220,6 @@ flextype()->container()['parsers'] = static function () {
     return new Parsers();
 };
 
-//flextype('parsers')->markdown()->getInstance()->setBreaksEnabled(flextype('registry')->get('flextype.settings.markdown.auto_line_breaks'));
-//flextype('parsers')->markdown()->getInstance()->setUrlsLinked(flextype('registry')->get('flextype.settings.markdown.auto_url_links'));
-//flextype('parsers')->markdown()->getInstance()->setMarkupEscaped(flextype('registry')->get('flextype.settings.markdown.escape_markup'));
-
 /**
  * Add serializer service to Flextype container
  */