diff --git a/package-lock.json b/package-lock.json
index 239a18f3..e52ca05e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2927,17 +2927,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "commonmark": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
-      "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
-      "requires": {
-        "entities": "~ 1.1.1",
-        "mdurl": "~ 1.0.1",
-        "minimist": "~ 1.2.0",
-        "string.prototype.repeat": "^0.2.0"
-      }
-    },
     "compressible": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
@@ -4217,7 +4206,8 @@
     "entities": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
     },
     "enzyme": {
       "version": "2.9.1",
@@ -8593,11 +8583,6 @@
         "inherits": "^2.0.1"
       }
     },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -17923,11 +17908,6 @@
         "function-bind": "^1.0.2"
       }
     },
-    "string.prototype.repeat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
-      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
diff --git a/package.json b/package.json
index 558ed0c7..995ff8e1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "@kyleshockey/js-yaml": "^1.0.1",
     "base64-js": "^1.2.0",
     "classnames": "^2.2.5",
-    "commonmark": "^0.28.1",
     "core-js": "^2.5.1",
     "css.escape": "1.5.1",
     "deep-extend": "0.5.1",
diff --git a/src/core/plugins/oas3/wrap-components/markdown.js b/src/core/plugins/oas3/wrap-components/markdown.js
index 650e099b..e825e37c 100644
--- a/src/core/plugins/oas3/wrap-components/markdown.js
+++ b/src/core/plugins/oas3/wrap-components/markdown.js
@@ -1,21 +1,17 @@
 import React from "react"
 import PropTypes from "prop-types"
 import cx from "classnames"
-import { Parser, HtmlRenderer } from "commonmark"
+import Remarkable from "remarkable"
 import { OAS3ComponentWrapFactory } from "../helpers"
 import { sanitizer } from "core/components/providers/markdown"
 
+const parser = new Remarkable("commonmark")
+
 export const Markdown = ({ source, className = "" }) => {
   if ( source ) {
-    const parser = new Parser()
-    const writer = new HtmlRenderer()
-    const html = writer.render(parser.parse(source || ""))
+    const html = parser.render(source)
     const sanitized = sanitizer(html)
 
-    if ( !source || !html || !sanitized ) {
-        return null
-    }
-
     return (
       <div
         dangerouslySetInnerHTML={{