diff --git a/bakerydemo/templates/locations/locations_index_page.html b/bakerydemo/templates/locations/locations_index_page.html
index 57134dc43..fbeef31d7 100644
--- a/bakerydemo/templates/locations/locations_index_page.html
+++ b/bakerydemo/templates/locations/locations_index_page.html
@@ -7,9 +7,15 @@
 
     <div class="container">
         <div class="location-list-page">
-            {% for location in locations %}
-                {% include "includes/card/picture-card.html" with page=location portrait=False %}
-            {% endfor %}
+            {% if locations %}
+                {% for location in locations %}
+                    {% include "includes/card/picture-card.html" with page=location portrait=False %}
+                {% endfor %}
+            {% else %}
+                <div class="col-md-12">
+                    <p>No locations available right now.</p>
+                </div>
+            {% endif %}
         </div>
     </div>
 {% endblock content %}