diff --git a/app/ecolyo.88d8c2cbee016aba09e6.js b/app/ecolyo.cae55ddd1d2112910edc.js
similarity index 99%
rename from app/ecolyo.88d8c2cbee016aba09e6.js
rename to app/ecolyo.cae55ddd1d2112910edc.js
index 7ac243e5205f27cc712e6dc3485eb27cc62c127c..925a9761a339545f3c777afa0e8582536f9fb967 100644
--- a/app/ecolyo.88d8c2cbee016aba09e6.js
+++ b/app/ecolyo.cae55ddd1d2112910edc.js
@@ -4573,7 +4573,7 @@ var PartnersInfoService = /*#__PURE__*/function () {
   /**
    * Get information from backoffice about the status of partners' service
    * On success, respond the partnersInfo
-   * Else, throw an error
+   * Else, return undefined
    */
 
 
@@ -20052,7 +20052,7 @@ var CustomPopupService = /*#__PURE__*/function () {
   /**
    * Get information from backoffice about the status of custom popup
    * On success, respond the customPopup
-   * Else, throw an error
+   * Else, return undefined
    */
 
 
@@ -23880,68 +23880,65 @@ var UsageEventService = /*#__PURE__*/function () {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
+                _context4.prev = 0;
                 _iterator = _createForOfIteratorHelper(events);
-                _context4.prev = 1;
+                _context4.prev = 2;
 
                 _iterator.s();
 
-              case 3:
+              case 4:
                 if ((_step = _iterator.n()).done) {
-                  _context4.next = 18;
+                  _context4.next = 10;
                   break;
                 }
 
                 event = _step.value;
-                _context4.prev = 5;
                 _context4.next = 8;
                 return client.save(_objectSpread(_objectSpread({}, event), {}, {
                   aggregated: true
                 }));
 
               case 8:
-                _context4.next = 16;
+                _context4.next = 4;
                 break;
 
               case 10:
-                _context4.prev = 10;
-                _context4.t0 = _context4["catch"](5);
-                errorMessage = "UsageEvent service error on updateUsageEventsAggregated: ".concat(JSON.stringify(_context4.t0));
-                logStack('error', errorMessage);
-
-                _logger.default.error(errorMessage);
-
-                Sentry.captureException(errorMessage);
-
-              case 16:
-                _context4.next = 3;
-                break;
-
-              case 18:
-                _context4.next = 23;
+                _context4.next = 15;
                 break;
 
-              case 20:
-                _context4.prev = 20;
-                _context4.t1 = _context4["catch"](1);
+              case 12:
+                _context4.prev = 12;
+                _context4.t0 = _context4["catch"](2);
 
-                _iterator.e(_context4.t1);
+                _iterator.e(_context4.t0);
 
-              case 23:
-                _context4.prev = 23;
+              case 15:
+                _context4.prev = 15;
 
                 _iterator.f();
 
-                return _context4.finish(23);
+                return _context4.finish(15);
 
-              case 26:
+              case 18:
                 return _context4.abrupt("return", true);
 
-              case 27:
+              case 21:
+                _context4.prev = 21;
+                _context4.t1 = _context4["catch"](0);
+                errorMessage = "UsageEvent service error on updateUsageEventsAggregated: ".concat(JSON.stringify(_context4.t1));
+                logStack('error', errorMessage);
+
+                _logger.default.error(errorMessage);
+
+                Sentry.captureException(errorMessage);
+                throw new Error('Could not update all events');
+
+              case 28:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee4, null, [[1, 20, 23, 26], [5, 10]]);
+        }, _callee4, null, [[0, 21], [2, 12, 15, 18]]);
       }));
 
       function updateUsageEventsAggregated(_x8, _x9) {
diff --git a/index.html b/index.html
index aef8c8d7146f3934a171098bfe9e4f6e097a157b..b833895ef423110ab5fc7f8e838381d4a5ac9437 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.88d8c2cbee016aba09e6.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.cae55ddd1d2112910edc.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index e5593bae16b8ad0f388dccf3861453025ae791b3..078b8ec65fb5a37705611e2baf8c688c6c48d8b3 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -119842,22 +119842,23 @@ class UsageEventService {
 
 
   static async updateUsageEventsAggregated(client, events) {
-    for (const event of events) {
-      try {
+    try {
+      for (const event of events) {
         await client.save(_objectSpread(_objectSpread({}, event), {}, {
           aggregated: true
         }));
-      } catch (error) {
-        const errorMessage = `UsageEvent service error on updateUsageEventsAggregated: ${JSON.stringify(error)}`;
-        logStack('error', errorMessage);
+      }
 
-        _logger.default.error(errorMessage);
+      return true;
+    } catch (error) {
+      const errorMessage = `UsageEvent service error on updateUsageEventsAggregated: ${JSON.stringify(error)}`;
+      logStack('error', errorMessage);
 
-        Sentry.captureException(errorMessage);
-      }
-    }
+      _logger.default.error(errorMessage);
 
-    return true;
+      Sentry.captureException(errorMessage);
+      throw new Error('Could not update all events');
+    }
   }
   /**
    * getEvents