diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
index 45448e4b2b..6125c02baf 100644
--- a/server/channels/app/limits.go
+++ b/server/channels/app/limits.go
@@ -10,8 +10,8 @@ import (
 )
 
 const (
-	maxUsersLimit     = 200
-	maxUsersHardLimit = 250
+	maxUsersLimit     = 10000000
+	maxUsersHardLimit = 10000000
 )
 
 // GetServerLimits returns the server's seat/post-history limits. The license-derived
@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod
 	limits := &model.ServerLimits{}
 	license := a.License()
 
-	if license == nil && maxUsersLimit > 0 {
-		// Enforce hard-coded limits for unlicensed servers (no grace period).
-		limits.MaxUsersLimit = maxUsersLimit
-		limits.MaxUsersHardLimit = maxUsersHardLimit
-	} else if license != nil && license.IsSeatCountEnforced && license.Features != nil && license.Features.Users != nil {
-		// Enforce license limits as required by the license with configurable extra users.
-		licenseUserLimit := int64(*license.Features.Users)
-		limits.MaxUsersLimit = licenseUserLimit
-
-		// Use ExtraUsers if configured, otherwise default to 0 (no extra users)
-		extraUsers := 0
-		if license.ExtraUsers != nil {
-			extraUsers = *license.ExtraUsers
-		}
-
-		limits.MaxUsersHardLimit = licenseUserLimit + int64(extraUsers)
-	}
+	limits.MaxUsersLimit = 0
+	limits.MaxUsersHardLimit = 0
 
 	// Check if license has post history limits and get the calculated timestamp
 	if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 {
@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 {
 }
 
 func (a *App) isAtUserLimit() (bool, *model.AppError) {
-	userLimits, appErr := a.GetServerLimits(true)
-	if appErr != nil {
-		return false, appErr
-	}
-
-	if userLimits.MaxUsersHardLimit == 0 {
-		return false, nil
-	}
-
-	return userLimits.ActiveUserCount >= userLimits.MaxUsersHardLimit, appErr
+	return false, nil
 }