diff --git a/app/user.go b/app/user.go
index 4633ac526f..ba31ca199b 100644
--- a/app/user.go
+++ b/app/user.go
@@ -1519,11 +1519,10 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
 }
 
 func (a *App) PermanentDeleteAllUsers() *model.AppError {
-	result := <-a.Srv.Store.User().GetAll()
-	if result.Err != nil {
-		return result.Err
+	users, err := a.Srv.Store.User().GetAll()
+	if err != nil {
+		return err
 	}
-	users := result.Data.([]*model.User)
 	for _, user := range users {
 		a.PermanentDeleteUser(user)
 	}
diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go
index 28b60408bb..908d85e0c2 100644
--- a/store/sqlstore/user_store.go
+++ b/store/sqlstore/user_store.go
@@ -340,24 +340,19 @@ func (us SqlUserStore) Get(id string) (*model.User, *model.AppError) {
 	return user, nil
 }
 
-func (us SqlUserStore) GetAll() store.StoreChannel {
-	return store.Do(func(result *store.StoreResult) {
-		query := us.usersQuery.OrderBy("Username ASC")
+func (us SqlUserStore) GetAll() ([]*model.User, *model.AppError) {
+	query := us.usersQuery.OrderBy("Username ASC")
 
-		queryString, args, err := query.ToSql()
-		if err != nil {
-			result.Err = model.NewAppError("SqlUserStore.GetAll", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
-		}
+	queryString, args, err := query.ToSql()
+	if err != nil {
+		return nil, model.NewAppError("SqlUserStore.GetAll", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
-		var data []*model.User
-		if _, err := us.GetReplica().Select(&data, queryString, args...); err != nil {
-			result.Err = model.NewAppError("SqlUserStore.GetAll", "store.sql_user.get.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		result.Data = data
-	})
+	var data []*model.User
+	if _, err := us.GetReplica().Select(&data, queryString, args...); err != nil {
+		return nil, model.NewAppError("SqlUserStore.GetAll", "store.sql_user.get.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
+	return data, nil
 }
 
 func (us SqlUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, *model.AppError) {
diff --git a/store/store.go b/store/store.go
index c5cff2b1f4..6e5d46a38a 100644
--- a/store/store.go
+++ b/store/store.go
@@ -259,7 +259,7 @@ type UserStore interface {
 	UpdateMfaSecret(userId, secret string) *model.AppError
 	UpdateMfaActive(userId string, active bool) StoreChannel
 	Get(id string) (*model.User, *model.AppError)
-	GetAll() StoreChannel
+	GetAll() ([]*model.User, *model.AppError)
 	ClearCaches()
 	InvalidateProfilesInChannelCacheByUser(userId string)
 	InvalidateProfilesInChannelCache(channelId string)
diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go
index e822d056f7..4bded86d5a 100644
--- a/store/storetest/mocks/UserStore.go
+++ b/store/storetest/mocks/UserStore.go
@@ -152,19 +152,28 @@ func (_m *UserStore) Get(id string) (*model.User, *model.AppError) {
 }
 
 // GetAll provides a mock function with given fields:
-func (_m *UserStore) GetAll() store.StoreChannel {
+func (_m *UserStore) GetAll() ([]*model.User, *model.AppError) {
 	ret := _m.Called()
 
-	var r0 store.StoreChannel
-	if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
+	var r0 []*model.User
+	if rf, ok := ret.Get(0).(func() []*model.User); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).([]*model.User)
 		}
 	}
 
-	return r0
+	var r1 *model.AppError
+	if rf, ok := ret.Get(1).(func() *model.AppError); ok {
+		r1 = rf()
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*model.AppError)
+		}
+	}
+
+	return r0, r1
 }
 
 // GetAllAfter provides a mock function with given fields: limit, afterId
diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go
index 4f4c3487f7..907e66be93 100644
--- a/store/storetest/user_store.go
+++ b/store/storetest/user_store.go
@@ -16,9 +16,8 @@ import (
 )
 
 func TestUserStore(t *testing.T, ss store.Store) {
-	result := <-ss.User().GetAll()
-	require.Nil(t, result.Err, "failed cleaning up test users")
-	users := result.Data.([]*model.User)
+	users, err := ss.User().GetAll()
+	require.Nil(t, err, "failed cleaning up test users")
 
 	for _, u := range users {
 		err := ss.User().PermanentDelete(u.Id)
@@ -441,10 +440,9 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 	})
 
 	t.Run("get all", func(t *testing.T) {
-		result := <-ss.User().GetAll()
-		require.Nil(t, result.Err)
+		actual, err := ss.User().GetAll()
+		require.Nil(t, err)
 
-		actual := result.Data.([]*model.User)
 		require.Equal(t, []*model.User{
 			u1,
 			u2,