diff --git a/jarvis/core/templates/dashboard/dashboard.html b/jarvis/core/templates/dashboard/dashboard.html
index f67d1db..8023873 100644
--- a/jarvis/core/templates/dashboard/dashboard.html
+++ b/jarvis/core/templates/dashboard/dashboard.html
@@ -136,7 +136,11 @@
{% if wellbeing_state %}
{% endif %}
- {{ wellbeing_last_record_date.0 |date:"j F Y" }}
+ {% if wellbeing_last_record_date %}
+ {{ wellbeing_last_record_date.0 |date:"j F Y" }}
+ {% else %}
+ Never
+ {% endif %}
{% if wellbeing_state %}
{% endif %}
@@ -146,7 +150,11 @@
{% if height_weight_state %}
{% endif %}
- {{ height_weight_last_record_date.0 |date:"j F Y" }}
+ {% if height_weight_last_record_date %}
+ {{ height_weight_last_record_date.0 |date:"j F Y" }}
+ {% else %}
+ Never
+ {% endif %}
{% if wellbeing_state %}
{% endif %}
@@ -156,7 +164,11 @@
{% if intensity_state %}
{% endif %}
- {{ intensities_last_record_date.0 |date:"j F Y" }}
+ {% if intensities_last_record_date %}
+ {{ intensities_last_record_date.0 |date:"j F Y" }}
+ {% else %}
+ Never
+ {% endif %}
{% if wellbeing_state %}
{% endif %}
@@ -167,7 +179,11 @@
{% if chrono_state %}
{% endif %}
- {{ chrono_last_record_date.0 |date:"j F Y" }}
+ {% if chrono_last_record_date %}
+ {{ chrono_last_record_date.0 |date:"j F Y" }}
+ {% else %}
+ Never
+ {% endif %}
{% if chrono_state %}
{% endif %}
@@ -177,7 +193,11 @@
{% if known_skills_state %}
{% endif %}
- {{ known_skills_last_record_date.0 |date:"j F Y" }}
+ {% if known_skills_last_record_date %}
+ {{ known_skills_last_record_date.0 |date:"j F Y" }}
+ {% else %}
+ Never
+ {% endif %}
{% if known_skills_state %}
{% endif %}