diff --git a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
index bfbf62711..11beafd78 100644
--- a/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/certificate-exchange/certificate-utils.tsx
@@ -329,12 +329,6 @@ export const generateAuthToken = async () => {
 };
 
 export const getAuthToken = async (): Promise<string> => {
-  // Ensure we check for the validity of certificates before
-  // returning an authentication token.
-  // If the server certificates have expired, they will need
-  // to be renewed and will invalidate any existing token.
-  await ensureServerCertExists();
-
   if (!(await hasAuthToken())) {
     return generateAuthToken();
   }
diff --git a/desktop/flipper-server/src/index.tsx b/desktop/flipper-server/src/index.tsx
index e5efd2d33..dc2e324bc 100644
--- a/desktop/flipper-server/src/index.tsx
+++ b/desktop/flipper-server/src/index.tsx
@@ -235,9 +235,6 @@ async function start() {
     `[flipper-server][bootstrap] FlipperServer created (${serverCreatedMS} ms)`,
   );
 
-  // At this point, the HTTP server is ready and configuration is set.
-  await launch();
-
   const t6 = performance.now();
   const launchedMS = t6 - t5;
 
@@ -266,6 +263,9 @@ async function start() {
   }
   await flipperServer.connect();
 
+  // At this point, the HTTP server is ready and configuration is set.
+  await launch();
+
   const t8 = performance.now();
   const appServerStartedMS = t8 - t7;
   console.info(