diff --git a/umap/templates/umap/map_detail.html b/umap/templates/umap/map_detail.html
index 7c58e9b6..ddf68523 100644
--- a/umap/templates/umap/map_detail.html
+++ b/umap/templates/umap/map_detail.html
@@ -17,8 +17,8 @@
   {% umap_css %}
   {{ block.super }}
   {% umap_js locale=locale %}
-  {% if object.share_status != object.PUBLIC %}
-    <meta name="robots" content="noindex">
+  {% if UMAP_DEMO_SITE or object.share_status != object.PUBLIC %}
+    <meta name="robots" content="noindex,nofollow">
   {% endif %}
   <link rel="alternate"
         type="application/json+oembed"
diff --git a/umap/tests/test_map_views.py b/umap/tests/test_map_views.py
index 8aa9947b..5f63d3ea 100644
--- a/umap/tests/test_map_views.py
+++ b/umap/tests/test_map_views.py
@@ -861,3 +861,22 @@ def test_ogp_links(client, map, datalayer):
     assert f'<meta property="og:title" content="{map.name}" />' in content
     assert f'<meta property="og:description" content="{map.description}" />' in content
     assert '<meta property="og:site_name" content="uMap" />' in content
+
+
+def test_non_public_map_should_have_noindex_meta(client, map, datalayer):
+    map.share_status = Map.OPEN
+    map.save()
+    response = client.get(map.get_absolute_url())
+    assert response.status_code == 200
+    assert (
+        '<meta name="robots" content="noindex,nofollow">' in response.content.decode()
+    )
+
+
+def test_demo_instance_should_have_noindex(client, map, datalayer, settings):
+    settings.UMAP_DEMO_SITE = True
+    response = client.get(map.get_absolute_url())
+    assert response.status_code == 200
+    assert (
+        '<meta name="robots" content="noindex,nofollow">' in response.content.decode()
+    )