diff --git a/apps/meteor/ee/server/startup/federation.ts b/apps/meteor/ee/server/startup/federation.ts
index 2102431defcff..1b4f3b38c7d7d 100644
--- a/apps/meteor/ee/server/startup/federation.ts
+++ b/apps/meteor/ee/server/startup/federation.ts
@@ -54,8 +54,6 @@ export const startFederationService = async (): Promise<void> => {
 		}
 	});
 
-	await setupFederationMatrix();
-
 	settings.watchMultiple(
 		[
 			'Federation_Service_Enabled',
@@ -72,4 +70,10 @@ export const startFederationService = async (): Promise<void> => {
 			await configureFederation();
 		},
 	);
+
+	try {
+		await setupFederationMatrix();
+	} catch (err) {
+		logger.error({ msg: 'Failed to setup federation-matrix:', err });
+	}
 };