diff --git a/packages/api-gateway/src/Bootstrap/Container.ts b/packages/api-gateway/src/Bootstrap/Container.ts
index d0fc5f8bd..335301084 100644
--- a/packages/api-gateway/src/Bootstrap/Container.ts
+++ b/packages/api-gateway/src/Bootstrap/Container.ts
@@ -119,6 +119,19 @@ export class ContainerConfigLoader {
     // Services
     container.bind<TimerInterface>(TYPES.ApiGateway_Timer).toConstantValue(new Timer())
 
+    if (isConfiguredForHomeServer) {
+      container
+        .bind<CrossServiceTokenCacheInterface>(TYPES.ApiGateway_CrossServiceTokenCache)
+        .toConstantValue(new InMemoryCrossServiceTokenCache(container.get(TYPES.ApiGateway_Timer)))
+    } else {
+      container
+        .bind<CrossServiceTokenCacheInterface>(TYPES.ApiGateway_CrossServiceTokenCache)
+        .to(RedisCrossServiceTokenCache)
+    }
+    container
+      .bind<EndpointResolverInterface>(TYPES.ApiGateway_EndpointResolver)
+      .toConstantValue(new EndpointResolver(isConfiguredForHomeServer))
+
     if (isConfiguredForHomeServer) {
       if (!configuration?.serviceContainer) {
         throw new Error('Service container is required when configured for home server')
@@ -169,19 +182,6 @@ export class ContainerConfigLoader {
       }
     }
 
-    if (isConfiguredForHomeServer) {
-      container
-        .bind<CrossServiceTokenCacheInterface>(TYPES.ApiGateway_CrossServiceTokenCache)
-        .toConstantValue(new InMemoryCrossServiceTokenCache(container.get(TYPES.ApiGateway_Timer)))
-    } else {
-      container
-        .bind<CrossServiceTokenCacheInterface>(TYPES.ApiGateway_CrossServiceTokenCache)
-        .to(RedisCrossServiceTokenCache)
-    }
-    container
-      .bind<EndpointResolverInterface>(TYPES.ApiGateway_EndpointResolver)
-      .toConstantValue(new EndpointResolver(isConfiguredForHomeServer))
-
     logger.debug('Configuration complete')
 
     return container