diff --git a/_includes/entry.html b/_includes/entry.html
index 1a23e7d..0543c84 100644
--- a/_includes/entry.html
+++ b/_includes/entry.html
@@ -1,5 +1,5 @@
 {% if post.id %}
-  {% assign title = post.title | markdownify | remove: "<p>" | remove: "</p>" %}
+  {% assign title = post.title | markdownify | strip_html %}
 {% else %}
   {% assign title = post.title %}
 {% endif %}
diff --git a/_includes/page-intro.html b/_includes/page-intro.html
index 4143757..2d664da 100644
--- a/_includes/page-intro.html
+++ b/_includes/page-intro.html
@@ -1,9 +1,9 @@
 <header id="intro" role="banner">
   <div class="inner">
     <div class="intro-text">
-      <h1 class="intro-title">{{ page.alt_title | default: page.title | default: site.title | markdownify | remove: '<p>' | remove: '</p>' }}</h1>
+      <h1 class="intro-title">{{ page.alt_title | default: page.title | default: site.title | markdownify | strip_html }}</h1>
       {% if page.sub_title %}
-        <p class="intro-subtitle">{{ page.sub_title | markdownify | remove: '<p>' | remove: '</p>' }}</p>
+        <p class="intro-subtitle">{{ page.sub_title | markdownify | strip_html }}</p>
       {% endif %}
 
       {% if page.date %}