diff --git a/src/c3nav/control/models.py b/src/c3nav/control/models.py
index 35f9418a..7949f17b 100644
--- a/src/c3nav/control/models.py
+++ b/src/c3nav/control/models.py
@@ -107,6 +107,10 @@ class UserPermissions(models.Model):
     def can_access_base_mapdata(self):
         return settings.PUBLIC_BASE_MAPDATA or self.base_mapdata_access
 
+    @property
+    def can_manage_mesh(self):
+        return settings.ENABLE_MESH or self.mesh_control
+
 
 get_permissions_for_user_lazy = lazy(UserPermissions.get_for_user, UserPermissions)
 
diff --git a/src/c3nav/control/templates/control/base.html b/src/c3nav/control/templates/control/base.html
index f69b507c..7fb9465d 100644
--- a/src/c3nav/control/templates/control/base.html
+++ b/src/c3nav/control/templates/control/base.html
@@ -24,7 +24,9 @@
             {% if request.user_permissions.manage_map_updates %}
                 <a href="{% url 'control.map_updates' %}">{% trans 'Map Updates' %}</a> &middot;
             {% endif %}
-            <a href="{% url 'mesh.nodes' %}">{% trans 'Mesh' %}</a> &middot;
+            {% if request.user_permissions.can_manage_mesh %}
+                <a href="{% url 'mesh.nodes' %}">{% trans 'Mesh' %}</a> &middot;
+            {% endif %}
             <a href="{% url 'control.users.detail' user=request.user.pk %}">{{ request.user.username }}</a>
         </p>
     </nav>
diff --git a/src/c3nav/site/templates/site/account.html b/src/c3nav/site/templates/site/account.html
index cbcc6aab..cdb5973b 100644
--- a/src/c3nav/site/templates/site/account.html
+++ b/src/c3nav/site/templates/site/account.html
@@ -24,7 +24,7 @@
             {% if request.user_permissions.can_review_reports %}
                 <a class="button" href="{% url 'site.report_list' %}">{% trans 'reports' %}</a>
             {% endif %}
-            {% if request.user_permissions.mesh_control %}
+            {% if request.user_permissions.can_manage_mesh %}
                 <a class="button" href="{% url 'mesh.nodes' %}">{% trans 'mesh' %}</a>
             {% endif %}
         </p>