diff --git a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
index d72e5364d101..0f21374ebf83 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
@@ -114,22 +114,6 @@ export const createSettings = async (): Promise<void> => {
 				modules: ['livechat-enterprise'],
 			});
 
-			await this.add('Omnichannel_queue_delay_timeout', 5, {
-				type: 'int',
-				group: 'Omnichannel',
-				section: 'Queue_management',
-				i18nLabel: 'Queue_delay_timeout',
-				i18nDescription: 'Time_in_seconds',
-				enableQuery: [
-					{ _id: 'Livechat_waiting_queue', value: true },
-					{ _id: 'Livechat_Routing_Method', value: { $ne: 'Manual_Selection' } },
-					omnichannelEnabledQuery,
-				],
-				enterprise: true,
-				invalidValue: 5,
-				modules: ['livechat-enterprise'],
-			});
-
 			await this.add('Livechat_number_most_recent_chats_estimate_wait_time', 100, {
 				type: 'int',
 				group: 'Omnichannel',
diff --git a/apps/meteor/server/services/omnichannel/queue.ts b/apps/meteor/server/services/omnichannel/queue.ts
index 8bf5453587ce..684c10161a94 100644
--- a/apps/meteor/server/services/omnichannel/queue.ts
+++ b/apps/meteor/server/services/omnichannel/queue.ts
@@ -15,7 +15,7 @@ export class OmnichannelQueue implements IOmnichannelQueue {
 	private queues: (string | undefined)[] = [];
 
 	private delay() {
-		const timeout = settings.get<number>('Omnichannel_queue_delay_timeout');
+		const timeout = settings.get<number>('Omnichannel_queue_delay_timeout') ?? 5;
 		return timeout < 1 ? DEFAULT_RACE_TIMEOUT : timeout * 1000;
 	}
 
diff --git a/apps/meteor/server/settings/omnichannel.ts b/apps/meteor/server/settings/omnichannel.ts
index 70fa92d347b8..fe5d27c1e677 100644
--- a/apps/meteor/server/settings/omnichannel.ts
+++ b/apps/meteor/server/settings/omnichannel.ts
@@ -534,6 +534,16 @@ export const createOmniSettings = () =>
 			enableQuery: [{ _id: 'Livechat_Routing_Method', value: 'External' }, omnichannelEnabledQuery],
 		});
 
+		await this.add('Omnichannel_queue_delay_timeout', 5, {
+			type: 'int',
+			group: 'Omnichannel',
+			section: 'Queue_management',
+			i18nLabel: 'Queue_delay_timeout',
+			i18nDescription: 'Time_in_seconds',
+			enableQuery: [{ _id: 'Livechat_Routing_Method', value: { $ne: 'Manual_Selection' } }, omnichannelEnabledQuery],
+			invalidValue: 5,
+		});
+
 		await this.add('Livechat_Allow_collect_and_store_HTTP_header_informations', false, {
 			type: 'boolean',
 			group: 'Omnichannel',