diff --git a/conekt/models/expression/cross_species_profile.py b/conekt/models/expression/cross_species_profile.py
index 93f5cfc..496a687 100644
--- a/conekt/models/expression/cross_species_profile.py
+++ b/conekt/models/expression/cross_species_profile.py
@@ -57,6 +57,9 @@ def get_data(self, *sequence_ids):
                             parsed_profile["data"][c] = parsed_profile["raw_data"][c]/max_value
                         else:
                             parsed_profile["data"][c] = None
+                else:
+                    for c in self.conditions:
+                            parsed_profile["data"][c] = None
 
                 converted_profiles.append(
                     {
diff --git a/conekt/templates/expression_heatmap.html b/conekt/templates/expression_heatmap.html
index 5e221c8..6aeb65e 100644
--- a/conekt/templates/expression_heatmap.html
+++ b/conekt/templates/expression_heatmap.html
@@ -98,7 +98,7 @@ <h1>Heatmap</h1>
                     <td><div><span>{{ p.name }}</span></div></td>
                     {% endif %}
                     {% for o in order %}
-                    <td class="value">{% if p['values'][o] != '-' and p['values'][o] is defined %}{{ p['values'][o]|round(2) }}{% else %}-{% endif %}</td>
+                    <td class="value">{% if p['values'][o] != '-' %}{{ p['values'][o]|round(2) }}{% else %}-{% endif %}</td>
                     {% endfor %}
                 </tr>
             {% endfor %}