diff --git a/app/templates/article.ejs b/app/templates/article.ejs
index 9b9d52e..2061d64 100644
--- a/app/templates/article.ejs
+++ b/app/templates/article.ejs
@@ -24,9 +24,11 @@
       <h1 id="article-title">
         <%- article.title %>
       </h1>
-      <h2 id="article-subtitle">
-        <%- article.subtitle %>
-      </h2>
+      <% if (article.subtitle) { %>
+        <h2 id="article-subtitle">
+          <%- article.subtitle %>
+        </h2>
+      <% } %>
       <time id="article-date">
         <%- article.date %>
       </time>
diff --git a/app/templates/articles.ejs b/app/templates/articles.ejs
index 87d02d5..c38de6f 100644
--- a/app/templates/articles.ejs
+++ b/app/templates/articles.ejs
@@ -21,18 +21,20 @@
     <section id="articles-container">
       <ul>
         <% articles.reverse().map((article) => { %>
-        <li id="articles-list-item">
-          <a href="./article/<%= article.id %>.html">
-            <h1><%= article.title %></h1>
-            <h2><%= article.subtitle %></h2>
-            <time><%= article.date %></time>
-            <ul class="articles-tags">
-              <% article.tags.map((tag) => { %>
-              <li>#<%= tag.trim() %></li>
-              <% }) %>
-            </ul>
-          </a>
-        </li>
+          <li id="articles-list-item">
+            <a href="./article/<%= article.id %>.html">
+              <h1><%= article.title %></h1>
+              <% if (article.subtitle) { %>
+                <h2><%= article.subtitle %></h2>
+              <% } %>
+              <time><%= article.date %></time>
+              <ul class="articles-tags">
+                <% article.tags.map((tag) => { %>
+                  <li>#<%= tag.trim() %></li>
+                <% }) %>
+              </ul>
+            </a>
+          </li>
         <% }) %>
       </ul>
     </section>
@@ -41,4 +43,4 @@
   <script defer src="../src/ts/init.ts"></script>
 </body>
 
-</html>
\ No newline at end of file
+</html>