diff --git a/umap/templates/umap/map_detail.html b/umap/templates/umap/map_detail.html
index 3fde7391..ddf68523 100644
--- a/umap/templates/umap/map_detail.html
+++ b/umap/templates/umap/map_detail.html
@@ -18,7 +18,7 @@
   {{ block.super }}
   {% umap_js locale=locale %}
   {% if UMAP_DEMO_SITE or object.share_status != object.PUBLIC %}
-    <meta name="robots" content="noindex">
+    <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 021082a1..5f63d3ea 100644
--- a/umap/tests/test_map_views.py
+++ b/umap/tests/test_map_views.py
@@ -868,11 +868,15 @@ def test_non_public_map_should_have_noindex_meta(client, map, datalayer):
     map.save()
     response = client.get(map.get_absolute_url())
     assert response.status_code == 200
-    assert '<meta name="robots" content="noindex">' in response.content.decode()
+    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">' in response.content.decode()
+    assert (
+        '<meta name="robots" content="noindex,nofollow">' in response.content.decode()
+    )