diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index 73bb7d5f0d0f90..b3602b54604b9f 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -337,21 +337,10 @@ export class FleetPlugin
 
     const fleetSetupPromise = (async () => {
       try {
-        logger.info('Beginning fleet setup');
-
-        const { nonFatalErrors } = await setupFleet(
+        await setupFleet(
           new SavedObjectsClient(core.savedObjects.createInternalRepository()),
           core.elasticsearch.client.asInternalUser
         );
-
-        if (nonFatalErrors.length > 0) {
-          logger.info('Encountered non fatal errors during Fleet setup');
-          formatNonFatalErrors(nonFatalErrors).forEach((error) =>
-            logger.info(JSON.stringify(error))
-          );
-        }
-
-        logger.info('Fleet setup completed');
       } catch (error) {
         logger.warn('Fleet setup failed');
         logger.warn(error);
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index f3d1381c5265b3..1c84073552e573 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -52,6 +52,7 @@ async function createSetupSideEffects(
   esClient: ElasticsearchClient
 ): Promise<SetupStatus> {
   const logger = appContextService.getLogger();
+  logger.info('Beginning fleet setup');
 
   const {
     agentPolicies: policiesOrUndefined,
@@ -114,6 +115,13 @@ async function createSetupSideEffects(
   logger.debug('Setting up Fleet Server agent policies');
   await ensureFleetServerAgentPoliciesExists(soClient, esClient);
 
+  if (nonFatalErrors.length > 0) {
+    logger.info('Encountered non fatal errors during Fleet setup');
+    formatNonFatalErrors(nonFatalErrors).forEach((error) => logger.info(JSON.stringify(error)));
+  }
+
+  logger.info('Fleet setup completed');
+
   return {
     isInitialized: true,
     nonFatalErrors,