diff --git a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/execute-tool.tool.ts b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/execute-tool.tool.ts
index 552af38ae55..f5335c8a6cf 100644
--- a/packages/twenty-server/src/engine/core-modules/tool-provider/tools/execute-tool.tool.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool-provider/tools/execute-tool.tool.ts
@@ -54,7 +54,7 @@ export const createExecuteToolTool = (
     parameters: ExecuteToolInput,
     options: ToolExecutionOptions,
   ): Promise<ToolOutput> => {
-    const { toolName, arguments: args } = parameters;
+    const { toolName, arguments: args = {} } = parameters;
 
     if (excludeTools?.has(toolName)) {
       return {
diff --git a/packages/twenty-server/src/engine/core-modules/tool/utils/wrap-tool-for-execution.util.ts b/packages/twenty-server/src/engine/core-modules/tool/utils/wrap-tool-for-execution.util.ts
index c2518a555d1..9a10367079d 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/utils/wrap-tool-for-execution.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/utils/wrap-tool-for-execution.util.ts
@@ -42,6 +42,10 @@ export const wrapJsonSchemaForExecution = (
 export const stripLoadingMessage = <T extends Record<string, unknown>>(
   parameters: T,
 ): Omit<T, 'loadingMessage'> => {
+  if (!parameters) {
+    return {} as Omit<T, 'loadingMessage'>;
+  }
+
   const { loadingMessage: _, ...rest } = parameters;
 
   return rest;