diff --git a/server/services/permissions/localpermissions/localpermissions.go b/server/services/permissions/localpermissions/localpermissions.go
index 54fa9366b..1456708b7 100644
--- a/server/services/permissions/localpermissions/localpermissions.go
+++ b/server/services/permissions/localpermissions/localpermissions.go
@@ -27,9 +27,7 @@ func New(store permissions.Store, logger *mlog.Logger) *Service {
 }
 
 func (s *Service) HasPermissionToTeam(userID, teamID string, permission *mmModel.Permission) bool {
-	if userID == "" || teamID == "" || permission == nil {
-		return false
-	}
+	// Locally there is no team, so return true
 	return true
 }
 
diff --git a/webapp/cypress/support/api_commands.ts b/webapp/cypress/support/api_commands.ts
index 542ded136..2c008058d 100644
--- a/webapp/cypress/support/api_commands.ts
+++ b/webapp/cypress/support/api_commands.ts
@@ -117,8 +117,8 @@ Cypress.Commands.add('apiChangePassword', (userId: string, oldPassword: string,
 
 Cypress.Commands.add('uiCreateNewBoard', (title?: string) => {
     cy.log('**Create new empty board**')
-    cy.findByText('+ Add board').click()
-    cy.get('.empty-board').first().click({force: true})
+    cy.uiCreateEmptyBoard()
+
     cy.findByPlaceholderText('Untitled board').should('exist')
     cy.wait(10)
     if (title) {
diff --git a/webapp/cypress/support/ui_commands.ts b/webapp/cypress/support/ui_commands.ts
index 674cab720..829022b65 100644
--- a/webapp/cypress/support/ui_commands.ts
+++ b/webapp/cypress/support/ui_commands.ts
@@ -16,7 +16,6 @@ Cypress.Commands.add('uiCreateBoard', (item: string) => {
 Cypress.Commands.add('uiCreateEmptyBoard', () => {
     cy.log('Create new empty board')
 
-    cy.contains('+ Add board').should('be.visible').click()
-
+    cy.contains('+ Add board').should('be.visible').click().wait(500)
     return cy.contains('Create empty board').click({force: true}).wait(1000)
 })