diff --git a/apps/meteor/ee/server/index.ts b/apps/meteor/ee/server/index.ts
index 9b56239ad046..f5b385c9a805 100644
--- a/apps/meteor/ee/server/index.ts
+++ b/apps/meteor/ee/server/index.ts
@@ -1,5 +1,3 @@
-import './startup';
-
 import '../app/license/server/index';
 import '../app/api-enterprise/server/index';
 import '../app/authorization/server/index';
diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts
index 5579261911f5..09edca701540 100644
--- a/apps/meteor/server/main.ts
+++ b/apps/meteor/server/main.ts
@@ -9,9 +9,10 @@ import './importPackages';
 import '../imports/startup/server';
 import '../app/lib/server/startup';
 
+import '../ee/server/startup';
+import './startup';
 import '../ee/server';
 import './lib/pushConfig';
-import './startup';
 import './configuration/accounts_meld';
 import './configuration/ldap';
 import './methods/OEmbedCacheCleanup';
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 9011dab086b6..fdb6a16393b3 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -28,6 +28,9 @@
 	"files": [
 		"/dist"
 	],
+	"volta": {
+		"extends": "../../../package.json"
+	},
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 4cce8aebe07b..3492cc1f77bf 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -30,6 +30,9 @@
 	"files": [
 		"/dist"
 	],
+	"volta": {
+		"extends": "../../package.json"
+	},
 	"dependencies": {
 		"@rocket.chat/apps-engine": "1.41.0-alpha.290",
 		"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/core-services/src/lib/Api.ts b/packages/core-services/src/lib/Api.ts
index 66806dc54fde..f0b5e67594c2 100644
--- a/packages/core-services/src/lib/Api.ts
+++ b/packages/core-services/src/lib/Api.ts
@@ -46,7 +46,11 @@ export class Api implements IApiService {
 	}
 
 	async broadcast<T extends keyof EventSignatures>(event: T, ...args: Parameters<EventSignatures[T]>): Promise<void> {
-		return this.broker?.broadcast(event, ...args);
+		if (!this.broker) {
+			throw new Error(`No broker set to broadcast: ${event}`);
+		}
+
+		return this.broker.broadcast(event, ...args);
 	}
 
 	async broadcastToServices<T extends keyof EventSignatures>(