diff --git a/apps/web/server/routers/elt/kasko.ts b/apps/web/server/routers/elt/kasko.ts
index 25ace4a..ec6ace9 100644
--- a/apps/web/server/routers/elt/kasko.ts
+++ b/apps/web/server/routers/elt/kasko.ts
@@ -19,19 +19,20 @@ export const eltKaskoRouter = router({
         const store = new RootStore();
         store.$calculation.$values.hydrate(input.calculation.values);
 
-        const { init: initElt } = await eltHelper({ apolloClient, store });
+        const context = { apolloClient, store };
+        const { init: initElt } = await eltHelper(context);
         const { kasko: initRows } = await initElt();
 
         const requests = initRows.map((row) =>
-          makeEltKaskoRequest({ apolloClient, store }, row).then((request) =>
-            getEltKasko(request)
-              .then((response) =>
-                convertEltKaskoResponse({ context: { apolloClient, store }, response, row }).then(
-                  (convertedRow) => convertedRow
-                )
-              )
-              .catch((error) => ({ ...row, message: error.message, status: 'error' }))
-          )
+          makeEltKaskoRequest(context, row)
+            .then((request) => getEltKasko(request))
+            .then((response) => convertEltKaskoResponse({ context, response, row }))
+            .then((convertedRow) => convertedRow)
+            .catch((error) => ({
+              ...row,
+              message: error.message,
+              status: 'error',
+            }))
         );
 
         return {