diff --git a/.vscode/launch.json b/.vscode/launch.json
index 48983ed70..8c8d67934 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,7 +3,7 @@
   "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
   "configurations": [
     {
-      "name": "twenty-server - dev debug",
+      "name": "twenty-server - start debug",
       "type": "node",
       "request": "launch",
       "runtimeExecutable": "yarn",
@@ -17,6 +17,22 @@
       "internalConsoleOptions": "openOnSessionStart",
       "console": "internalConsole",
       "cwd": "${workspaceFolder}/packages/twenty-server/"
+    },
+    {
+      "name": "twenty-server - worker debug",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "yarn",
+      "runtimeVersion": "18",
+      "runtimeArgs": [
+        "nx",
+        "run",
+        "twenty-server:worker",
+      ],
+      "outputCapture": "std",
+      "internalConsoleOptions": "openOnSessionStart",
+      "console": "internalConsole",
+      "cwd": "${workspaceFolder}/packages/twenty-server/"
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts
index e9191c450..6deeacbec 100644
--- a/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts
+++ b/packages/twenty-server/src/engine/integrations/cache-storage/cache-storage.service.ts
@@ -55,9 +55,11 @@ export class CacheStorageService {
     return this.get(key).then((res: string[]) => {
       if (res) {
         this.set(key, res.slice(0, -size));
+
+        return res.slice(-size);
       }
 
-      return res;
+      return [];
     });
   }
 
diff --git a/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts
index a883ab0d4..5c3803f4a 100644
--- a/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts
+++ b/packages/twenty-server/src/modules/messaging/constants/gmail-users-messages-get-batch-size.constant.ts
@@ -1 +1 @@
-export const GMAIL_USERS_MESSAGES_GET_BATCH_SIZE = 50;
+export const GMAIL_USERS_MESSAGES_GET_BATCH_SIZE = 10;