diff --git a/apps/server/src/services/hidden_subtree.ts b/apps/server/src/services/hidden_subtree.ts
index 6ba0d965b..8b6c7e9fb 100644
--- a/apps/server/src/services/hidden_subtree.ts
+++ b/apps/server/src/services/hidden_subtree.ts
@@ -380,7 +380,7 @@ function checkHiddenSubtreeRecursively(parentNoteId: string, item: HiddenSubtree
                 type: attr.type,
                 name: attr.name,
                 value: attr.value,
-                isInheritable: false
+                isInheritable: attr.isInheritable
             }).save();
         } else if (attr.name === "docName" || (existingAttribute.noteId.startsWith("_help") && attr.name === "iconClass")) {
             if (existingAttribute.value !== attr.value) {
diff --git a/apps/server/src/services/hidden_subtree_templates.ts b/apps/server/src/services/hidden_subtree_templates.ts
index 62c841898..cfe61922c 100644
--- a/apps/server/src/services/hidden_subtree_templates.ts
+++ b/apps/server/src/services/hidden_subtree_templates.ts
@@ -43,6 +43,33 @@ export default function buildHiddenSubtreeTemplates() {
                         value: "table"
                     }
                 ]
+            },
+            {
+                id: "_template_geo_map",
+                type: "book",
+                title: "Geo Map",
+                icon: "bx bx-map-alt",
+                attributes: [
+                    {
+                        name: "template",
+                        type: "label"
+                    },
+                    {
+                        name: "viewType",
+                        type: "label",
+                        value: "geoMap"
+                    },
+                    {
+                        name: "hidePromotedAttributes",
+                        type: "label"
+                    },
+                    {
+                        name: "label:geolocation",
+                        type: "label",
+                        value: "promoted,alias=Geolocation,single,text",
+                        isInheritable: true
+                    }
+                ]
             }
         ]
     };