diff --git a/src/components/app/routes/data/utils.js b/src/components/app/routes/data/utils.js
index 819e69b85..87177a3d8 100644
--- a/src/components/app/routes/data/utils.js
+++ b/src/components/app/routes/data/utils.js
@@ -48,7 +48,7 @@ export async function ensureEnterpriseAppData({
   queryClient,
   requestUrl,
 }) {
-  const matchedBFFQuery = resolveBFFQuery(requestUrl.pathname);
+  const matchedBFFQuery = resolveBFFQuery(requestUrl.pathname, { enterpriseCustomerUuid: enterpriseCustomer.uuid });
   const enterpriseAppDataQueries = [];
   if (!matchedBFFQuery) {
     const subscriptionsQuery = querySubscriptions(enterpriseCustomer.uuid);
diff --git a/src/components/dashboard/data/dashboardLoader.ts b/src/components/dashboard/data/dashboardLoader.ts
index 8f571c7d1..a2bacc3a1 100644
--- a/src/components/dashboard/data/dashboardLoader.ts
+++ b/src/components/dashboard/data/dashboardLoader.ts
@@ -37,7 +37,7 @@ const makeDashboardLoader: Types.MakeRouteLoaderFunctionWithQueryClient = functi
       enterpriseSlug,
     });
 
-    const dashboardBFFQuery = resolveBFFQuery(requestUrl.pathname, enterpriseCustomer.uuid);
+    const dashboardBFFQuery = resolveBFFQuery(requestUrl.pathname, { enterpriseCustomerUuid: enterpriseCustomer.uuid });
     const loadEnrollmentsPoliciesAndRedirectForNewUsers = Promise.all([
       queryClient.ensureQueryData(
         dashboardBFFQuery