diff --git a/packages/server/lib/routes.js b/packages/server/lib/routes.js
index daed749c..c4e8f6b0 100644
--- a/packages/server/lib/routes.js
+++ b/packages/server/lib/routes.js
@@ -78,10 +78,10 @@ const loadRoutes = async () => {
   // app /pair and /ca routes
   app.use('/', pairingRoutes)
 
-  app.use(findOperatorId)
   app.use(populateDeviceId)
   app.use(authorize)
   app.use(filterOldRequests)
+  app.use(findOperatorId)
   app.use(configRequiredRoutes, populateSettings)
 
   // other app routes