diff --git a/keyserver/src/keyserver.js b/keyserver/src/keyserver.js
--- a/keyserver/src/keyserver.js
+++ b/keyserver/src/keyserver.js
@@ -40,7 +40,7 @@
 (async () => {
   await prefetchAllURLFacts();
 
-  const squadCalBaseRoutePath = getSquadCalURLFacts().baseRoutePath;
+  const squadCalBaseRoutePath = getSquadCalURLFacts()?.baseRoutePath;
   const landingBaseRoutePath = getLandingURLFacts().baseRoutePath;
   const commAppBaseRoutePath = getCommAppURLFacts().baseRoutePath;
 
@@ -150,9 +150,11 @@
     setupAppRouter(commAppRouter);
     server.use(commAppBaseRoutePath, commAppRouter);
 
-    const squadCalRouter = express.Router();
-    setupAppRouter(squadCalRouter);
-    server.use(squadCalBaseRoutePath, squadCalRouter);
+    if (squadCalBaseRoutePath) {
+      const squadCalRouter = express.Router();
+      setupAppRouter(squadCalRouter);
+      server.use(squadCalBaseRoutePath, squadCalRouter);
+    }
 
     server.listen(parseInt(process.env.PORT, 10) || 3000, 'localhost');
   }
diff --git a/keyserver/src/utils/urls.js b/keyserver/src/utils/urls.js
--- a/keyserver/src/utils/urls.js
+++ b/keyserver/src/utils/urls.js
@@ -42,10 +42,8 @@
   await Promise.all(sites.map(fetchURLFacts));
 }
 
-function getSquadCalURLFacts(): AppURLFacts {
-  const urlFacts = cachedURLFacts.get('squadcal');
-  invariant(urlFacts, 'keyserver/facts/squadcal_url.json missing');
-  return urlFacts;
+function getSquadCalURLFacts(): ?AppURLFacts {
+  return cachedURLFacts.get('squadcal');
 }
 
 function getCommAppURLFacts(): AppURLFacts {
@@ -56,9 +54,14 @@
 
 function getAppURLFactsFromRequestURL(url: string): AppURLFacts {
   const commURLFacts = getCommAppURLFacts();
-  return commURLFacts && url.startsWith(commURLFacts.baseRoutePath)
-    ? commURLFacts
-    : getSquadCalURLFacts();
+  if (commURLFacts && url.startsWith(commURLFacts.baseRoutePath)) {
+    return commURLFacts;
+  }
+  const squadCalURLFacts = getSquadCalURLFacts();
+  if (squadCalURLFacts) {
+    return squadCalURLFacts;
+  }
+  invariant(false, 'request received but no URL facts are present');
 }
 
 function getLandingURLFacts(): AppURLFacts {