diff --git a/server/utils/agents/aibitat/plugins/cli.js b/server/utils/agents/aibitat/plugins/cli.js
index 06a60e98e6..fab80c0d48 100644
--- a/server/utils/agents/aibitat/plugins/cli.js
+++ b/server/utils/agents/aibitat/plugins/cli.js
@@ -19,14 +19,9 @@ const cli = {
         let printing = [];
 
         aibitat.onError(async (error) => {
-          console.error(chalk.red(`   error: ${error?.message}`));
-          if (error instanceof RetryError) {
-            console.error(chalk.red(`   retrying in 60 seconds...`));
-            setTimeout(() => {
-              aibitat.retry();
-            }, 60000);
-            return;
-          }
+          let errorMessage =
+            error?.message || "An error occurred while running the agent.";
+          console.error(chalk.red(`   error: ${errorMessage}`), error);
         });
 
         aibitat.onStart(() => {
diff --git a/server/utils/agents/aibitat/plugins/http-socket.js b/server/utils/agents/aibitat/plugins/http-socket.js
index 30c68f6949..bbfd1cbc29 100644
--- a/server/utils/agents/aibitat/plugins/http-socket.js
+++ b/server/utils/agents/aibitat/plugins/http-socket.js
@@ -1,5 +1,4 @@
 const chalk = require("chalk");
-const { RetryError } = require("../error");
 const { Telemetry } = require("../../../../models/telemetry");
 
 /**
@@ -33,20 +32,16 @@ const httpSocket = {
       name: this.name,
       setup(aibitat) {
         aibitat.onError(async (error) => {
-          if (!!error?.message) {
-            console.error(chalk.red(`   error: ${error.message}`), error);
-            aibitat.introspect(
-              `Error encountered while running: ${error.message}`
-            );
-          }
-
-          if (error instanceof RetryError) {
-            console.error(chalk.red(`   retrying in 60 seconds...`));
-            setTimeout(() => {
-              aibitat.retry();
-            }, 60_000);
-            return;
-          }
+          let errorMessage =
+            error?.message || "An error occurred while running the agent.";
+          console.error(chalk.red(`   error: ${errorMessage}`), error);
+          aibitat.introspect(
+            `Error encountered while running: ${errorMessage}`
+          );
+          handler.send(
+            JSON.stringify({ type: "wssFailure", content: errorMessage })
+          );
+          aibitat.terminate();
         });
 
         aibitat.introspect = (messageText) => {
diff --git a/server/utils/agents/aibitat/plugins/websocket.js b/server/utils/agents/aibitat/plugins/websocket.js
index a253bd010e..2544918652 100644
--- a/server/utils/agents/aibitat/plugins/websocket.js
+++ b/server/utils/agents/aibitat/plugins/websocket.js
@@ -1,5 +1,4 @@
 const chalk = require("chalk");
-const { RetryError } = require("../error");
 const { Telemetry } = require("../../../../models/telemetry");
 const SOCKET_TIMEOUT_MS = 300 * 1_000; // 5 mins
 
@@ -49,20 +48,16 @@ const websocket = {
       name: this.name,
       setup(aibitat) {
         aibitat.onError(async (error) => {
-          if (!!error?.message) {
-            console.error(chalk.red(`   error: ${error.message}`), error);
-            aibitat.introspect(
-              `Error encountered while running: ${error.message}`
-            );
-          }
-
-          if (error instanceof RetryError) {
-            console.error(chalk.red(`   retrying in 60 seconds...`));
-            setTimeout(() => {
-              aibitat.retry();
-            }, 60000);
-            return;
-          }
+          let errorMessage =
+            error?.message || "An error occurred while running the agent.";
+          console.error(chalk.red(`   error: ${errorMessage}`), error);
+          aibitat.introspect(
+            `Error encountered while running: ${errorMessage}`
+          );
+          socket.send(
+            JSON.stringify({ type: "wssFailure", content: errorMessage })
+          );
+          aibitat.terminate();
         });
 
         aibitat.introspect = (messageText) => {