diff --git a/app/templates/task.html b/app/templates/task.html
index 8c76d43..8e77271 100644
--- a/app/templates/task.html
+++ b/app/templates/task.html
@@ -29,9 +29,11 @@
                 <div>
                     <p>Due: {{ task.due_timestamp }}</p>
                 </div>
+                {% if task.expiry_date != None %}
                 <div>
                     <p>Expires: {{ task.expiry_date }}</p>
                 </div>
+                {% endif %}
                 <p>
                     <a class="btn btn-primary" href="/task/{{task.id}}/edit">Edit Task</a>
                     <span>
diff --git a/app/templates/tasks.html b/app/templates/tasks.html
index bd8fe5a..81c5c96 100644
--- a/app/templates/tasks.html
+++ b/app/templates/tasks.html
@@ -28,7 +28,9 @@
                 </b>
                 <div>
                     <p>Created: {{ createdTime.strftime('%Y-%m-%d %I:%M %p') }}</p>
+                    {% if task.expiry_date != None %}
                     <p>Expires: {{ task.expiry_date }}</p>
+                    {% endif %}
                 </div>
                 <hr>
             </div>