diff --git a/webapp/src/components/sidebar.tsx b/webapp/src/components/sidebar.tsx
index ce5d402b2..d6cd3e8a2 100644
--- a/webapp/src/components/sidebar.tsx
+++ b/webapp/src/components/sidebar.tsx
@@ -193,16 +193,18 @@ class Sidebar extends React.Component<Props, State> {
                         />
                     </Button>
                     <Menu position='top'>
-                        <Menu.Label>
-                            <b>
-                                <FormattedMessage
-                                    id='Sidebar.select-a-template'
-                                    defaultMessage='Select a template'
-                                />
-                            </b>
-                        </Menu.Label>
+                        {workspaceTree.boardTemplates.length > 0 && <>
+                            <Menu.Label>
+                                <b>
+                                    <FormattedMessage
+                                        id='Sidebar.select-a-template'
+                                        defaultMessage='Select a template'
+                                    />
+                                </b>
+                            </Menu.Label>
 
-                        <Menu.Separator/>
+                            <Menu.Separator/>
+                        </>}
 
                         {workspaceTree.boardTemplates.map((boardTemplate) => {
                             let displayName = boardTemplate.title || intl.formatMessage({id: 'Sidebar.untitled', defaultMessage: 'Untitled'})
diff --git a/webapp/src/components/viewHeader.tsx b/webapp/src/components/viewHeader.tsx
index e499571e3..bbf9d7a7a 100644
--- a/webapp/src/components/viewHeader.tsx
+++ b/webapp/src/components/viewHeader.tsx
@@ -388,16 +388,18 @@ class ViewHeader extends React.Component<Props, State> {
                     )}
                 >
                     <Menu position='left'>
-                        <Menu.Label>
-                            <b>
-                                <FormattedMessage
-                                    id='ViewHeader.select-a-template'
-                                    defaultMessage='Select a template'
-                                />
-                            </b>
-                        </Menu.Label>
+                        {boardTree.cardTemplates.length > 0 && <>
+                            <Menu.Label>
+                                <b>
+                                    <FormattedMessage
+                                        id='ViewHeader.select-a-template'
+                                        defaultMessage='Select a template'
+                                    />
+                                </b>
+                            </Menu.Label>
 
-                        <Menu.Separator/>
+                            <Menu.Separator/>
+                        </>}
 
                         {boardTree.cardTemplates.map((cardTemplate) => {
                             let displayName = cardTemplate.title || intl.formatMessage({id: 'ViewHeader.untitled', defaultMessage: 'Untitled'})