diff --git a/server/channels/app/platform/service.go b/server/channels/app/platform/service.go
index 0aa732ad01..1366fb6e40 100644
--- a/server/channels/app/platform/service.go
+++ b/server/channels/app/platform/service.go
@@ -367,9 +367,7 @@ func (ps *PlatformService) Start(broadcastHooks map[string]BroadcastHook) error
 
 		message := model.NewWebSocketEvent(model.WebsocketEventLicenseChanged, "", "", "", nil, "")
 		message.Add("license", ps.GetSanitizedClientLicense())
-		ps.Go(func() {
-			ps.Publish(message)
-		})
+		ps.Publish(message)
 	})
 	return nil
 }
diff --git a/server/channels/app/server.go b/server/channels/app/server.go
index 6d35b60cce..2168c20318 100644
--- a/server/channels/app/server.go
+++ b/server/channels/app/server.go
@@ -227,11 +227,6 @@ func NewServer(options ...Option) (*Server, error) {
 		return nil, errors.Wrapf(err, "unable to create users service")
 	}
 
-	if model.BuildEnterpriseReady == "true" {
-		// Dependent on user service
-		s.LoadLicense()
-	}
-
 	s.licenseWrapper = &licenseWrapper{
 		srv: s,
 	}