diff --git a/discord_rss_bot/templates/custom.html b/discord_rss_bot/templates/custom.html
index 890aa45..8a0ed5b 100644
--- a/discord_rss_bot/templates/custom.html
+++ b/discord_rss_bot/templates/custom.html
@@ -114,6 +114,7 @@
                                         {% endraw %}
                                     </code>{{entry.author}}
                                 </li>
+                                {% if entry.content %}
                                 <li>
                                     <code>
                                         {% raw %}
@@ -128,6 +129,7 @@
                                         {% endraw %}
                                     </code>{{entry.content[0].value}}
                                 </li>
+                                {% endif %}
                                 <li>
                                     <code>
                                         {% raw %}
@@ -170,6 +172,7 @@
                                         {% endraw %}
                                     </code>{{entry.read_modified}}
                                 </li>
+                                {% if entry.summary %}
                                 <li>
                                     <code>
                                         {% raw %}
@@ -184,6 +187,7 @@
                                         {% endraw %}
                                     </code>{{entry.summary}}
                                 </li>
+                                {% endif %}
                                 <li>
                                     <code>
                                         {% raw %}
@@ -216,16 +220,6 @@
                                         {% endraw %}
                                     </code>
                                 </li>
-                                <br/>
-                                <li>Will become:</li>
-                                <li>
-                                    <code>
-                                        <pre>
-{{feed.title -}}
-{{- entry.content[0].value|discord_markdown -}}
-                            </pre>
-                                    </code>
-                                </li>
                             </ul>
                         {% else %}
                             Something went wrong, there was no entry found. If this feed has entries and you still see this message, please contact the developer.
diff --git a/discord_rss_bot/templates/embed.html b/discord_rss_bot/templates/embed.html
index 3446442..4084d12 100644
--- a/discord_rss_bot/templates/embed.html
+++ b/discord_rss_bot/templates/embed.html
@@ -110,6 +110,7 @@
                                     {% endraw %}
                                 </code>{{entry.author}}
                             </li>
+                            {% if entry.content %}
                             <li>
                                 <code>
                                     {% raw %}
@@ -124,6 +125,7 @@
                                     {% endraw %}
                                 </code>{{entry.content[0].value}}
                             </li>
+                            {% endif %}
                             <li>
                                 <code>
                                     {% raw %}
@@ -166,6 +168,7 @@
                                     {% endraw %}
                                 </code>{{entry.read_modified}}
                             </li>
+                            {% if entry.summary %}
                             <li>
                                 <code>
                                     {% raw %}
@@ -180,6 +183,7 @@
                                     {% endraw %}
                                 </code>{{entry.summary}}
                             </li>
+                            {% endif %}
                             <li>
                                 <code>
                                     {% raw %}