diff --git a/templates/table/gmrkng_col.html b/templates/table/gmrkng_col.html
index f8d7397c..4dd5d397 100644
--- a/templates/table/gmrkng_col.html
+++ b/templates/table/gmrkng_col.html
@@ -1,6 +1,11 @@
 {% load i18n fontawesome_5 %}
 
-{% if geometry.geom is not None %}
+{% if geometry.geom is None or geometry.geom.empty %}
+    <span class="text-info" title="{% translate 'No geometry added, yet.' %}">
+        {% fa5_icon 'search-location' %}
+        {% fa5_icon 'question' %}
+    </span>
+{% else %}
     {% for entry in entries %}
         <span class="badge pill-badge rlp-r">{{entry}}</span>
     {% empty %}
@@ -8,9 +13,4 @@
             {% fa5_icon 'hourglass-half' %}
         </span>
     {% endfor %}
-{% else %}
-        <span class="text-info" title="{% translate 'No geometry added, yet.' %}">
-            {% fa5_icon 'search-location' %}
-            {% fa5_icon 'question' %}
-        </span>
 {% endif %}
\ No newline at end of file