diff --git a/src/templates/page.js b/src/templates/page.js
index 3d1b252..921966e 100755
--- a/src/templates/page.js
+++ b/src/templates/page.js
@@ -35,7 +35,7 @@ const Page = ({ data, location }) => {
                         {/* The main page content */}
                         <section
                             className="content-body load-external-scripts"
-                            dangerouslySetInnerHTML={{ __html: page.html.replace(new RegExp(config.mediaUrlFrom, 'g'), config.mediaUrlTo) }}
+                            dangerouslySetInnerHTML={{ __html: page.html ? page.html.replace(new RegExp(config.mediaUrlFrom, 'g'), config.mediaUrlTo) : page.html }}
                         />
                     </article>
                 </div>
diff --git a/src/templates/post.js b/src/templates/post.js
index d1dbce5..63bd20b 100755
--- a/src/templates/post.js
+++ b/src/templates/post.js
@@ -40,7 +40,7 @@ const Post = ({ data, location }) => {
                                 {/* The main post content */ }
                                 <section
                                     className="content-body load-external-scripts"
-                                    dangerouslySetInnerHTML={{ __html: post.html.replace(new RegExp(config.mediaUrlFrom, 'g'), config.mediaUrlTo) }}
+                                    dangerouslySetInnerHTML={{ __html: post.html ? post.html.replace(new RegExp(config.mediaUrlFrom, 'g'), config.mediaUrlTo) : post.html }}
                                 />
                                 <section className="content-footer">
                                     <p>