diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
index ff216fd74c..669715d647 100644
--- a/server/channels/app/limits.go
+++ b/server/channels/app/limits.go
@@ -12,8 +12,8 @@ import (
 )
 
 const (
-	maxUsersLimit     = 5_000
-	maxUsersHardLimit = 11_000
+	maxUsersLimit     = 2_500
+	maxUsersHardLimit = 5_000
 )
 
 func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
diff --git a/server/channels/app/limits_test.go b/server/channels/app/limits_test.go
index 852a69b915..06b6c10ea8 100644
--- a/server/channels/app/limits_test.go
+++ b/server/channels/app/limits_test.go
@@ -20,7 +20,7 @@ func TestGetServerLimits(t *testing.T) {
 
 		// InitBasic creates 3 users by default
 		require.Equal(t, int64(3), serverLimits.ActiveUserCount)
-		require.Equal(t, int64(5000), serverLimits.MaxUsersLimit)
+		require.Equal(t, int64(2500), serverLimits.MaxUsersLimit)
 	})
 
 	t.Run("user count should increase on creating new user and decrease on permanently deleting", func(t *testing.T) {
diff --git a/server/channels/app/user_test.go b/server/channels/app/user_test.go
index eb91bbc10c..c0b668ff4d 100644
--- a/server/channels/app/user_test.go
+++ b/server/channels/app/user_test.go
@@ -2306,7 +2306,7 @@ func TestCreateUserOrGuest(t *testing.T) {
 		defer th.TearDown()
 
 		id := NewTestId()
-		userCreationMocks(t, th, id, 11000)
+		userCreationMocks(t, th, id, 5000)
 
 		user := &model.User{
 			Email:         "TestCreateUserOrGuest@example.com",
diff --git a/webapp/channels/src/packages/mattermost-redux/src/actions/limits.test.ts b/webapp/channels/src/packages/mattermost-redux/src/actions/limits.test.ts
index dff50bbeea..753e00fd1f 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/actions/limits.test.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/actions/limits.test.ts
@@ -76,7 +76,7 @@ describe('getServerLimits', () => {
     test('should return data if user is admin', async () => {
         const userLimits: ServerLimits = {
             activeUserCount: 600,
-            maxUsersLimit: 5_000,
+            maxUsersLimit: 2_500,
 
         };