diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx
index adb4ba1e7..937360522 100644
--- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx
+++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx
@@ -123,6 +123,7 @@ describe('components/boardTemplateSelector/boardTemplateSelector', () => {
                         properties: {
                             trackingTemplateId: 'template_id_2',
                         },
+                        createdBy: 'system',
                     },
                 ],
                 membersInBoards: {
@@ -151,6 +152,7 @@ describe('components/boardTemplateSelector/boardTemplateSelector', () => {
                     properties: {
                         trackingTemplateId: 'template_id_global',
                     },
+                    createdBy: 'system',
                 }],
             },
         }
diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx
index 014b04801..3cc1f29d2 100644
--- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx
+++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx
@@ -79,8 +79,8 @@ describe('components/boardTemplateSelector/boardTemplateSelectorItem', () => {
         id: 'global-1',
         title: 'Template global',
         teamId: '0',
-        createdBy: 'user-1',
-        modifiedBy: 'user-1',
+        createdBy: 'system',
+        modifiedBy: 'system',
         createAt: 10,
         updateAt: 20,
         deleteAt: 0,
diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx
index 2384469dd..7cb21591e 100644
--- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx
+++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx
@@ -44,7 +44,7 @@ const BoardTemplateSelectorItem = (props: Props) => {
             <span className='template-name'>{template.title || intl.formatMessage({id: 'View.NewTemplateTitle', defaultMessage: 'Untitled'})}</span>
 
             {/* don't show template menu options for default templates */}
-            {template.teamId !== Constants.globalTeamId &&
+            {template.createdBy !== Constants.SystemUserID &&
                 <div className='actions'>
                     <BoardPermissionGate
                         boardId={template.id}
diff --git a/webapp/src/constants.ts b/webapp/src/constants.ts
index bce49a848..75ed51ffb 100644
--- a/webapp/src/constants.ts
+++ b/webapp/src/constants.ts
@@ -198,6 +198,8 @@ class Constants {
     static readonly globalTeamId = '0'
 
     static readonly myInsights = 'MY'
+
+    static readonly SystemUserID = 'system'
 }
 
 export {Constants, Permission}