diff --git a/server/src/server.js b/server/src/server.js
index de93f6556..b0741b9be 100644
--- a/server/src/server.js
+++ b/server/src/server.js
@@ -1,150 +1,155 @@
 // @flow
 
 import cluster from 'cluster';
 import cookieParser from 'cookie-parser';
 import express from 'express';
 import expressWs from 'express-ws';
 import os from 'os';
 
 import './cron/cron';
 import { migrate } from './database/migrations';
 import { jsonEndpoints } from './endpoints';
 import { emailSubscriptionResponder } from './responders/comm-landing-responders';
 import {
   jsonHandler,
   httpGetHandler,
   downloadHandler,
   htmlHandler,
   uploadHandler,
 } from './responders/handlers';
 import landingHandler from './responders/landing-handler';
 import { errorReportDownloadResponder } from './responders/report-responders';
 import {
   createNewVersionResponder,
   markVersionDeployedResponder,
 } from './responders/version-responders';
 import { websiteResponder } from './responders/website-responders';
 import { onConnection } from './socket/socket';
 import {
   multerProcessor,
   multimediaUploadResponder,
   uploadDownloadResponder,
 } from './uploads/uploads';
 import {
   getSquadCalURLFacts,
   getLandingURLFacts,
   getCommAppURLFacts,
 } from './utils/urls';
 
 const squadCalBaseRoutePath = getSquadCalURLFacts().baseRoutePath;
 const landingBaseRoutePath = getLandingURLFacts().baseRoutePath;
 const commAppBaseRoutePath = getCommAppURLFacts().baseRoutePath;
 
 const compiledFolderOptions =
   process.env.NODE_ENV === 'development'
     ? undefined
     : { maxAge: '1y', immutable: true };
 
 if (cluster.isMaster) {
   (async () => {
     const didMigrationsSucceed: boolean = await migrate();
     if (!didMigrationsSucceed) {
       // The following line uses exit code 2 to ensure nodemon exits
       // in a dev environment, instead of restarting. Context provided
       // in https://github.com/remy/nodemon/issues/751
       process.exit(2);
     }
     const cpuCount = os.cpus().length;
     for (let i = 0; i < cpuCount; i++) {
       cluster.fork();
     }
   })();
   cluster.on('exit', () => cluster.fork());
 } else {
   const server = express();
   expressWs(server);
   server.use(express.json({ limit: '50mb' }));
   server.use(cookieParser());
 
   const setupAppRouter = router => {
     router.use('/images', express.static('images'));
     router.use('/fonts', express.static('fonts'));
     router.use('/misc', express.static('misc'));
     router.use(
       '/.well-known',
       express.static(
         '.well-known',
         // Necessary for apple-app-site-association file
         {
           setHeaders: res => res.setHeader('Content-Type', 'application/json'),
         },
       ),
     );
     router.use(
       '/compiled',
       express.static('app_compiled', compiledFolderOptions),
     );
     router.use('/', express.static('icons'));
 
     for (const endpoint in jsonEndpoints) {
       // $FlowFixMe Flow thinks endpoint is string
       const responder = jsonEndpoints[endpoint];
       const expectCookieInvalidation = endpoint === 'log_out';
       router.post(
         `/${endpoint}`,
         jsonHandler(responder, expectCookieInvalidation),
       );
     }
 
     router.get(
       '/create_version/:deviceType/:codeVersion',
       httpGetHandler(createNewVersionResponder),
     );
     router.get(
       '/mark_version_deployed/:deviceType/:codeVersion',
       httpGetHandler(markVersionDeployedResponder),
     );
 
     router.get(
       '/download_error_report/:reportID',
       downloadHandler(errorReportDownloadResponder),
     );
     router.get(
       '/upload/:uploadID/:secret',
       downloadHandler(uploadDownloadResponder),
     );
 
     // $FlowFixMe express-ws has side effects that can't be typed
     router.ws('/ws', onConnection);
     router.get('*', htmlHandler(websiteResponder));
 
     router.post(
       '/upload_multimedia',
       multerProcessor,
       uploadHandler(multimediaUploadResponder),
     );
   };
 
-  const squadCalRouter = express.Router();
-  setupAppRouter(squadCalRouter);
-  server.use(squadCalBaseRoutePath, squadCalRouter);
-
-  const commAppRouter = express.Router();
-  setupAppRouter(commAppRouter);
-  server.use(commAppBaseRoutePath, commAppRouter);
+  // Note - the order of router declarations matters. On prod we have
+  // squadCalBaseRoutePath configured to '/', which means it's a catch-all. If
+  // we call server.use on squadCalRouter first, it will catch all requests and
+  // prevent commAppRouter and landingRouter from working correctly. So we make
+  // sure that squadCalRouter goes last
 
   const landingRouter = express.Router();
   landingRouter.use('/images', express.static('images'));
   landingRouter.use('/fonts', express.static('fonts'));
   landingRouter.use(
     '/compiled',
     express.static('landing_compiled', compiledFolderOptions),
   );
   landingRouter.use('/', express.static('landing_icons'));
   landingRouter.post('/subscribe_email', emailSubscriptionResponder);
   landingRouter.get('*', landingHandler);
-
   server.use(landingBaseRoutePath, landingRouter);
 
+  const commAppRouter = express.Router();
+  setupAppRouter(commAppRouter);
+  server.use(commAppBaseRoutePath, commAppRouter);
+
+  const squadCalRouter = express.Router();
+  setupAppRouter(squadCalRouter);
+  server.use(squadCalBaseRoutePath, squadCalRouter);
+
   server.listen(parseInt(process.env.PORT, 10) || 3000, 'localhost');
 }