diff --git a/app/server.go b/app/server.go
index 0a3ed916eb..0576c37644 100644
--- a/app/server.go
+++ b/app/server.go
@@ -95,6 +95,7 @@ const (
 	FilestoreKey ServiceKey = "filestore"
 	ClusterKey   ServiceKey = "cluster"
 	PostKey      ServiceKey = "post"
+	TeamKey      ServiceKey = "team"
 )
 
 type Server struct {
@@ -370,11 +371,25 @@ func NewServer(options ...Option) (*Server, error) {
 		srv: s,
 	}
 
+	s.teamService, err = teams.New(teams.ServiceConfig{
+		TeamStore:    s.Store.Team(),
+		ChannelStore: s.Store.Channel(),
+		GroupStore:   s.Store.Group(),
+		Users:        s.userService,
+		WebHub:       s,
+		ConfigFn:     s.Config,
+		LicenseFn:    s.License,
+	})
+	if err != nil {
+		return nil, errors.Wrapf(err, "unable to create teams service")
+	}
+
 	serviceMap := map[ServiceKey]interface{}{
 		ConfigKey:    s.configStore,
 		LicenseKey:   s.licenseWrapper,
 		FilestoreKey: s.filestore,
 		ClusterKey:   s.clusterWrapper,
+		TeamKey:      s.teamService,
 	}
 
 	// Step 8: Initialize products.
@@ -469,19 +484,6 @@ func NewServer(options ...Option) (*Server, error) {
 	})
 	s.htmlTemplateWatcher = htmlTemplateWatcher
 
-	s.teamService, err = teams.New(teams.ServiceConfig{
-		TeamStore:    s.Store.Team(),
-		ChannelStore: s.Store.Channel(),
-		GroupStore:   s.Store.Group(),
-		Users:        s.userService,
-		WebHub:       s,
-		ConfigFn:     s.Config,
-		LicenseFn:    s.License,
-	})
-	if err != nil {
-		return nil, errors.Wrapf(err, "unable to create teams service")
-	}
-
 	s.configListenerId = s.AddConfigListener(func(_, _ *model.Config) {
 		ch := s.Channels()
 		ch.regenerateClientConfig()
diff --git a/app/teams/teams.go b/app/teams/teams.go
index 4511f96417..1d7ddbc412 100644
--- a/app/teams/teams.go
+++ b/app/teams/teams.go
@@ -196,3 +196,13 @@ func (ts *TeamService) RemoveTeamMember(teamMember *model.TeamMember) error {
 
 	return nil
 }
+
+// GetMember return the team member from the team.
+func (ts *TeamService) GetMember(teamID string, userID string) (*model.TeamMember, error) {
+	member, err := ts.store.GetMember(context.Background(), teamID, userID)
+	if err != nil {
+		return nil, err
+	}
+
+	return member, err
+}