diff --git a/public/locales/de.json b/public/locales/de.json
index d14f36f6..51bbc782 100644
--- a/public/locales/de.json
+++ b/public/locales/de.json
@@ -41,7 +41,8 @@
         "duplicate": "Duplizieren",
         "notifications": {
             "delete_warning": "Roboter kann nicht gelöscht werden, da zugehörige Ausführungen vorhanden sind",
-            "delete_success": "Roboter erfolgreich gelöscht"
+            "delete_success": "Roboter erfolgreich gelöscht",
+            "auth_success": "Roboter erfolgreich authentifiziert"
         }
     },
     "mainmenu": {
diff --git a/public/locales/en.json b/public/locales/en.json
index 64ac4177..a7843bd0 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -42,7 +42,8 @@
       "search":"Search Robots...",
       "notifications": {
         "delete_warning": "Cannot delete robot as it has associated runs",
-        "delete_success": "Robot deleted successfully"
+        "delete_success": "Robot deleted successfully",
+        "auth_success": "Robot successfully authenticated"
       }
     },
     "mainmenu":{
diff --git a/public/locales/es.json b/public/locales/es.json
index c0a39216..78e5a9d4 100644
--- a/public/locales/es.json
+++ b/public/locales/es.json
@@ -42,7 +42,8 @@
     "search": "Buscar robots...",
     "notifications": {
       "delete_warning": "No se puede eliminar el robot ya que tiene ejecuciones asociadas",
-      "delete_success": "Robot eliminado exitosamente"
+      "delete_success": "Robot eliminado exitosamente",
+      "auth_success": "Robot autenticado exitosamente"
     }
   },
   "mainmenu": {
diff --git a/public/locales/ja.json b/public/locales/ja.json
index 676b2149..fc88abac 100644
--- a/public/locales/ja.json
+++ b/public/locales/ja.json
@@ -42,7 +42,8 @@
         "search": "ロボットを検索...",
         "notifications": {
             "delete_warning": "関連する実行があるため、ロボットを削除できません",
-            "delete_success": "ロボットが正常に削除されました"
+            "delete_success": "ロボットが正常に削除されました",
+            "auth_success": "ロボットの認証に成功しました"
         }
   },
   "mainmenu": {
diff --git a/public/locales/zh.json b/public/locales/zh.json
index d7f7a9d2..1c45464b 100644
--- a/public/locales/zh.json
+++ b/public/locales/zh.json
@@ -42,7 +42,8 @@
     "search": "搜索机器人...",
     "notifications": {
       "delete_warning": "无法删除机器人，因为它有关联的运行记录",
-      "delete_success": "机器人删除成功"
+      "delete_success": "机器人删除成功",
+      "auth_success": "机器人认证成功"
     }
   },
   "mainmenu": {
diff --git a/server/src/routes/auth.ts b/server/src/routes/auth.ts
index 837fcd8a..49af7090 100644
--- a/server/src/routes/auth.ts
+++ b/server/src/routes/auth.ts
@@ -380,11 +380,19 @@ router.get(
         httpOnly: false,
         maxAge: 60000,
       }); // 1-minute expiration
-      res.cookie("robot_auth_message", "Robot successfully authenticated", {
+      // res.cookie("robot_auth_message", "Robot successfully authenticated", {
+      //   httpOnly: false,
+      //   maxAge: 60000,
+      // });
+      res.cookie('robot_auth_robotId', robotId, {
         httpOnly: false,
         maxAge: 60000,
       });
-      res.redirect(`${process.env.PUBLIC_URL}/robots/${robotId}/integrate` as string || `http://localhost:5173/robots/${robotId}/integrate`);
+
+      const baseUrl = process.env.PUBLIC_URL || "http://localhost:5173";
+      const redirectUrl = `${baseUrl}/robots/`;
+
+      res.redirect(redirectUrl);
     } catch (error: any) {
       res.status(500).json({ message: `Google OAuth error: ${error.message}` });
     }
diff --git a/src/components/integration/IntegrationSettings.tsx b/src/components/integration/IntegrationSettings.tsx
index 835221ca..31c93368 100644
--- a/src/components/integration/IntegrationSettings.tsx
+++ b/src/components/integration/IntegrationSettings.tsx
@@ -29,20 +29,6 @@ export interface IntegrationSettings {
   data: string;
 }
 
-// Helper functions to replace js-cookie functionality
-const getCookie = (name: string): string | null => {
-  const value = `; ${document.cookie}`;
-  const parts = value.split(`; ${name}=`);
-  if (parts.length === 2) {
-    return parts.pop()?.split(';').shift() || null;
-  }
-  return null;
-};
-
-const removeCookie = (name: string): void => {
-  document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
-};
-
 export const IntegrationSettingsModal = ({
   isOpen,
   handleStart,
@@ -154,17 +140,6 @@ export const IntegrationSettingsModal = ({
   };
 
   useEffect(() => {
-    // Check if there is a success message in cookies
-    const status = getCookie("robot_auth_status");
-    const message = getCookie("robot_auth_message");
-
-    if (status === "success" && message) {
-      notify("success", message);
-      // Clear the cookies after reading
-      removeCookie("robot_auth_status");
-      removeCookie("robot_auth_message");
-    }
-
     // Check if we're on the callback URL
     const urlParams = new URLSearchParams(window.location.search);
     const code = urlParams.get("code");
diff --git a/src/components/robot/Recordings.tsx b/src/components/robot/Recordings.tsx
index 9ddfccc7..e63f5e1c 100644
--- a/src/components/robot/Recordings.tsx
+++ b/src/components/robot/Recordings.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { RecordingsTable } from "./RecordingsTable";
 import { Grid } from "@mui/material";
 import { RunSettings, RunSettingsModal } from "../run/RunSettings";
@@ -8,6 +8,8 @@ import { RobotSettingsModal } from "./RobotSettings";
 import { RobotEditModal } from "./RobotEdit";
 import { RobotDuplicationModal } from "./RobotDuplicate";
 import { useNavigate, useLocation, useParams } from "react-router-dom";
+import { useGlobalInfoStore } from "../../context/globalInfo";
+import { useTranslation } from "react-i18next";
 
 interface RecordingsProps {
   handleEditRecording: (id: string, fileName: string) => void;
@@ -26,6 +28,8 @@ export const Recordings = ({
   const location = useLocation();
   const { selectedRecordingId } = useParams();
   const [params, setParams] = useState<string[]>([]);
+  const { notify } = useGlobalInfoStore();
+  const { t } = useTranslation();
 
   const handleNavigate = (path: string, id: string, name: string, params: string[]) => {
     setParams(params);
@@ -39,6 +43,31 @@ export const Recordings = ({
     navigate("/robots"); // Navigate back to the main robots page
   };
 
+  useEffect(() => {
+    // Helper function to get and clear a cookie
+    const getAndClearCookie = (name: string) => {
+      const value = document.cookie
+        .split('; ')
+        .find(row => row.startsWith(`${name}=`))
+        ?.split('=')[1];
+      
+      if (value) {
+        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
+      }
+      
+      return value;
+    };
+
+    const authStatus = getAndClearCookie('robot_auth_status');
+    const robotId = getAndClearCookie('robot_auth_robotId');
+
+    if (authStatus === 'success' && robotId) {
+      notify(authStatus, t("recordingtable.notifications.auth_success"));
+
+      handleNavigate(`/robots/${robotId}/integrate`, robotId, "", []);''  
+    }
+  }, []);
+
   // Determine which modal to open based on the current route
   const getCurrentModal = () => {
     const currentPath = location.pathname;