From 7e728d0b6f33809017252c04e0f67c4efb7c9688 Mon Sep 17 00:00:00 2001
From: Maria A Nunez <maria.nunez@mattermost.com>
Date: Thu, 4 Nov 2021 12:26:28 -0400
Subject: [PATCH] MM-39804 - Remove license expiration checks for cloud
 (#18921)

---
 app/server.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/server.go b/app/server.go
index 8ae501e817..1b3bc02996 100644
--- a/app/server.go
+++ b/app/server.go
@@ -1761,6 +1761,11 @@ func (s *Server) doLicenseExpirationCheck() {
 		return
 	}
 
+	if *license.Features.Cloud {
+		mlog.Debug("Skipping license expiration check for Cloud")
+		return
+	}
+
 	users, err := s.Store.User().GetSystemAdminProfiles()
 	if err != nil {
 		mlog.Error("Failed to get system admins for license expired message from Mattermost.")