diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
index 3fbf540354..1c083e4199 100644
--- a/src/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -35,7 +35,7 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
       <app-toolbar>
         <ha-menu-button hass="[[hass]]" narrow="[[narrow]]"></ha-menu-button>
         <div main-title>[[localize('panel.map')]]</div>
-        <template is="dom-if" if="[[!computeDemo()]]">
+        <template is="dom-if" if="[[computeShowEditZone(hass)]]">
           <paper-icon-button
             icon="hass:pencil"
             on-click="openZonesEditor"
@@ -75,8 +75,8 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
     }
   }
 
-  computeDemo() {
-    return __DEMO__;
+  computeShowEditZone(hass) {
+    return !__DEMO__ && hass.user.is_admin;
   }
 
   openZonesEditor() {