diff --git a/app/templates/editEvent.html b/app/templates/editEvent.html
index cb48cb5..2c5b78e 100644
--- a/app/templates/editEvent.html
+++ b/app/templates/editEvent.html
@@ -9,7 +9,10 @@
     <p>
         <b><a href="/task/{{ event.tasks.id }}">
             {{ event.tasks.title }}
-        </a></b> <br> {{ event.tasks.description }}
+
+        </a></b> <br>{% if event.tasks.description != None %}
+                       <p>{{ event.tasks.description }}</p>
+                     {% endif %}
     </p>
     {% else %}
       <div><p>(no task assigned... yet)</p></div>
diff --git a/app/templates/events.html b/app/templates/events.html
index fc9cfe1..f0dea65 100644
--- a/app/templates/events.html
+++ b/app/templates/events.html
@@ -20,7 +20,9 @@
                         </a>
                 </b>
                 <div>
+                    {% if event.tasks.description != None %}
                     <p>{{ event.tasks.description }}</p>
+                    {% endif %}
                 </div>
                 {% else %}
                     <div><p>(no task assigned... yet)</p></div>
diff --git a/app/templates/task.html b/app/templates/task.html
index 71ff660..886659b 100644
--- a/app/templates/task.html
+++ b/app/templates/task.html
@@ -8,7 +8,9 @@
             <div>
                 <div>
                     <br>
-                    <p>{{ task.description }}</p>
+                    {% if task.description != None %}
+                        <p>{{ task.description }}</p>
+                    {% endif %}
                 </div>
                 <div>
                     <p>Created: {{ createdTime.strftime('%Y-%m-%d %I:%M %p') }} </p>
diff --git a/app/templates/tasks.html b/app/templates/tasks.html
index dbe5e03..e7f0db8 100644
--- a/app/templates/tasks.html
+++ b/app/templates/tasks.html
@@ -11,7 +11,9 @@
                 <p><b>{{ task.title }}</b> </p>
                 </a>
                 <b>
-                            {{ task.description }}
+                    {% if task.description != None %}
+                        {{ task.description }}
+                    {% endif %}
                 </b>
                 <div>
                     <p>Created: {{ createdTime.strftime('%Y-%m-%d %I:%M %p') }}</p>