From 025a948905d0569460e4e6a7e781f6e5959314c1 Mon Sep 17 00:00:00 2001
From: Claudio Costa <cstcld91@gmail.com>
Date: Fri, 16 Jul 2021 17:15:36 +0200
Subject: [PATCH] Remove override of MaxNotificationsPerChannel (#17939)

---
 app/server.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/server.go b/app/server.go
index e13b5f020e..c868d94672 100644
--- a/app/server.go
+++ b/app/server.go
@@ -73,8 +73,6 @@ import (
 	"github.com/mattermost/mattermost-server/v5/utils"
 )
 
-var MaxNotificationsPerChannelDefault int64 = 1000000
-
 // declaring this as var to allow overriding in tests
 var SentryDSN = "placeholder_sentry_dsn"
 
@@ -596,15 +594,9 @@ func NewServer(options ...Option) (*Server, error) {
 
 	s.checkPushNotificationServerUrl()
 
-	license := s.License()
-	if license == nil {
-		s.UpdateConfig(func(cfg *model.Config) {
-			cfg.TeamSettings.MaxNotificationsPerChannel = &MaxNotificationsPerChannelDefault
-		})
-	}
-
 	s.ReloadConfig()
 
+	license := s.License()
 	allowAdvancedLogging := license != nil && *license.Features.AdvancedLogging
 
 	if s.Audit == nil {