diff --git a/server/services/store/sqlstore/sqlstore.go b/server/services/store/sqlstore/sqlstore.go
index 1fda2ed0d..e03b76077 100644
--- a/server/services/store/sqlstore/sqlstore.go
+++ b/server/services/store/sqlstore/sqlstore.go
@@ -44,11 +44,8 @@ func New(dbType, connectionString, tablePrefix string, logger *mlog.Logger, db *
 		return nil, err
 	}
 
-	err = store.InitializeTemplates()
-	if err != nil {
+	if err := store.InitializeTemplates(); err != nil {
 		logger.Error(`InitializeTemplates failed`, mlog.Err(err))
-
-		return nil, err
 	}
 
 	return store, nil