diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html
index 49f035a1..7aca518f 100644
--- a/umap/templates/umap/content.html
+++ b/umap/templates/umap/content.html
@@ -12,7 +12,9 @@
   <header class="wrapper row">
     {% include "umap/navigation.html" with title=SITE_NAME %}
   </header>
-  {% include "umap/messages.html" with title=SITE_NAME %}
+  {% block messages %}
+    {% include "umap/messages.html" with title=SITE_NAME %}
+  {% endblock messages %}
 {% endblock header %}
 {% block content %}
   {% if UMAP_READONLY %}
diff --git a/umap/templates/umap/home.html b/umap/templates/umap/home.html
index 47b2b880..4c673e1e 100644
--- a/umap/templates/umap/home.html
+++ b/umap/templates/umap/home.html
@@ -1,5 +1,8 @@
 {% extends "umap/content.html" %}
 {% load umap_tags i18n %}
+{% block messages %}
+  {# We don't want maps in the list to display errors. #}
+{% endblock messages %}
 {% block maincontent %}
   {% include "umap/search_bar.html" %}
   {% include "umap/about_summary.html" %}
diff --git a/umap/templates/umap/search.html b/umap/templates/umap/search.html
index 296816a2..ad81b667 100644
--- a/umap/templates/umap/search.html
+++ b/umap/templates/umap/search.html
@@ -1,5 +1,8 @@
 {% extends "umap/content.html" %}
 {% load i18n %}
+{% block messages %}
+  {# We don't want maps from the results list to display errors in the main page. #}
+{% endblock messages %}
 {% block maincontent %}
   {% include "umap/search_bar.html" %}
   <div class="wrapper">