From 8e548f5f86d8a82fcdbd67b59b3f719a8841e94b Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Wed, 20 Oct 2021 11:03:55 -0600
Subject: [PATCH 1/2] delay start of email inbox

---
 server/features/EmailInbox/EmailInbox.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/features/EmailInbox/EmailInbox.ts b/server/features/EmailInbox/EmailInbox.ts
index 3973f8cdd642..a0de8a0495a5 100644
--- a/server/features/EmailInbox/EmailInbox.ts
+++ b/server/features/EmailInbox/EmailInbox.ts
@@ -81,5 +81,7 @@ export async function configureEmailInboxes(): Promise<void> {
 }
 
 Meteor.startup(() => {
-	configureEmailInboxes();
+	Meteor.defer(() => {
+		configureEmailInboxes();
+	});
 });

From b303b0ea166d4be7f2564915d98fc335fcb70e4b Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Wed, 20 Oct 2021 19:19:55 -0600
Subject: [PATCH 2/2] use watchOnce

---
 server/features/EmailInbox/EmailInbox.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/features/EmailInbox/EmailInbox.ts b/server/features/EmailInbox/EmailInbox.ts
index a0de8a0495a5..f483e546a4ab 100644
--- a/server/features/EmailInbox/EmailInbox.ts
+++ b/server/features/EmailInbox/EmailInbox.ts
@@ -7,6 +7,7 @@ import { IMAPInterceptor } from '../../email/IMAPInterceptor';
 import { IEmailInbox } from '../../../definition/IEmailInbox';
 import { onEmailReceived } from './EmailInbox_Incoming';
 import { logger } from './logger';
+import { settings } from '../../../app/settings/server';
 
 export type Inbox = {
 	imap: IMAPInterceptor;
@@ -81,7 +82,7 @@ export async function configureEmailInboxes(): Promise<void> {
 }
 
 Meteor.startup(() => {
-	Meteor.defer(() => {
+	settings.watchOnce('Livechat_Routing_Method', (_) => {
 		configureEmailInboxes();
 	});
 });