diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
index 23710c326d..7dab2d8e7d 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
@@ -1676,8 +1676,15 @@ export const collectionsSlice = createSlice({
           if (!item.draft) {
             item.draft = cloneDeep(item);
           }
-          item.draft.request.auth = {};
-          item.draft.request.auth.mode = action.payload.mode;
+          const newMode = action.payload.mode;
+          const savedMode = get(item, 'request.auth.mode');
+          item.draft.request.auth = { mode: newMode };
+          if (newMode === savedMode) {
+            const savedPayload = get(item, `request.auth.${newMode}`);
+            if (savedPayload !== undefined) {
+              item.draft.request.auth[newMode] = cloneDeep(savedPayload);
+            }
+          }
         }
       }
     },
@@ -2106,8 +2113,15 @@ export const collectionsSlice = createSlice({
             root: cloneDeep(collection.root)
           };
         }
-        set(collection, 'draft.root.request.auth', {});
-        set(collection, 'draft.root.request.auth.mode', action.payload.mode);
+        const newMode = action.payload.mode;
+        const savedMode = get(collection, 'root.request.auth.mode');
+        set(collection, 'draft.root.request.auth', { mode: newMode });
+        if (newMode === savedMode) {
+          const savedPayload = get(collection, `root.request.auth.${newMode}`);
+          if (savedPayload !== undefined) {
+            set(collection, `draft.root.request.auth.${newMode}`, cloneDeep(savedPayload));
+          }
+        }
       }
     },
     updateCollectionAuth: (state, action) => {
@@ -3304,8 +3318,15 @@ export const collectionsSlice = createSlice({
         if (!folder.draft) {
           folder.draft = cloneDeep(folder.root);
         }
-        set(folder, 'draft.request.auth', {});
-        set(folder, 'draft.request.auth.mode', action.payload.mode);
+        const newMode = action.payload.mode;
+        const savedMode = get(folder, 'root.request.auth.mode');
+        set(folder, 'draft.request.auth', { mode: newMode });
+        if (newMode === savedMode) {
+          const savedPayload = get(folder, `root.request.auth.${newMode}`);
+          if (savedPayload !== undefined) {
+            set(folder, `draft.request.auth.${newMode}`, cloneDeep(savedPayload));
+          }
+        }
       }
     },
     streamDataReceived: (state, action) => {
diff --git a/tests/request/auth-mode-switch.spec.ts b/tests/request/auth-mode-switch.spec.ts
new file mode 100644
index 0000000000..c8efa12249
--- /dev/null
+++ b/tests/request/auth-mode-switch.spec.ts
@@ -0,0 +1,125 @@
+import { test, expect } from '../../playwright';
+import type { Page } from '@playwright/test';
+import {
+  closeAllCollections,
+  createCollection,
+  createRequest,
+  createFolder,
+  openRequest,
+  selectRequestPaneTab,
+  saveRequest
+} from '../utils/page';
+
+const dropdownItem = (page: Page, text: string) =>
+  page.locator('.dropdown-item').filter({ hasText: text });
+
+const fieldEditor = (page: Page, labelText: string) =>
+  page
+    .locator('label')
+    .filter({ hasText: new RegExp(`^${labelText}$`) })
+    .locator('..')
+    .locator('.single-line-editor-wrapper .CodeMirror');
+
+const selectAuthMode = async (page: Page, modeLabel: string) => {
+  await page.locator('.auth-mode-label').click();
+  await dropdownItem(page, modeLabel).click();
+};
+
+const typeIntoField = async (page: Page, labelText: string, value: string) => {
+  await fieldEditor(page, labelText).click();
+  await page.keyboard.type(value);
+};
+
+const readField = async (page: Page, labelText: string): Promise<string> => {
+  const editor = fieldEditor(page, labelText).first();
+  await editor.waitFor({ state: 'visible' });
+  return editor.evaluate((el: any) => (el as any).CodeMirror?.getValue() ?? '');
+};
+
+test.describe('Auth mode switch preserves saved data', () => {
+  test.afterEach(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('Request: switching back to the saved mode restores its credentials', async ({ page, createTmpDir }) => {
+    await createCollection(page, 'auth-mode-switch-req', await createTmpDir());
+    await createRequest(page, 'request-1', 'auth-mode-switch-req', { url: 'https://example.com/api' });
+    await openRequest(page, 'auth-mode-switch-req', 'request-1');
+    await selectRequestPaneTab(page, 'Auth');
+
+    await test.step('Save Bearer with a token', async () => {
+      await selectAuthMode(page, 'Bearer Token');
+      await typeIntoField(page, 'Token', 'saved-bearer-token');
+      await saveRequest(page);
+    });
+
+    await test.step('Bearer → Basic → Bearer restores the saved token (the bug fix)', async () => {
+      await selectAuthMode(page, 'Basic Auth');
+      await selectAuthMode(page, 'Bearer Token');
+
+      await expect.poll(() => readField(page, 'Token')).toBe('saved-bearer-token');
+    });
+
+    await test.step('Switching to a non-saved mode shows empty fields (no regression)', async () => {
+      await selectAuthMode(page, 'Basic Auth');
+
+      await expect.poll(() => readField(page, 'Username')).toBe('');
+      await expect.poll(() => readField(page, 'Password')).toBe('');
+    });
+
+    await test.step('Switching to a third unrelated mode also leaves fields empty', async () => {
+      // Bearer is the saved mode; Digest has never been touched.
+      await selectAuthMode(page, 'Digest Auth');
+
+      await expect.poll(() => readField(page, 'Username')).toBe('');
+      await expect.poll(() => readField(page, 'Password')).toBe('');
+    });
+
+    await test.step('Returning once more to Bearer still restores the saved token', async () => {
+      await selectAuthMode(page, 'Bearer Token');
+      await expect.poll(() => readField(page, 'Token')).toBe('saved-bearer-token');
+    });
+  });
+
+  test('Collection: switching back to the saved mode restores its credentials', async ({ page, createTmpDir }) => {
+    await createCollection(page, 'auth-mode-switch-col', await createTmpDir());
+
+    // The collection settings tab opens automatically on creation.
+    await page.locator('.tab.auth').click();
+
+    await test.step('Save Bearer at the collection level', async () => {
+      await selectAuthMode(page, 'Bearer Token');
+      await typeIntoField(page, 'Token', 'collection-bearer-token');
+      await page.getByRole('button', { name: 'Save' }).click();
+    });
+
+    await test.step('Bearer → Basic → Bearer restores the saved collection token', async () => {
+      await selectAuthMode(page, 'Basic Auth');
+      await selectAuthMode(page, 'Bearer Token');
+
+      await expect.poll(() => readField(page, 'Token')).toBe('collection-bearer-token');
+    });
+  });
+
+  test('Folder: switching back to the saved mode restores its credentials', async ({ page, createTmpDir }) => {
+    await createCollection(page, 'auth-mode-switch-folder', await createTmpDir());
+    await createFolder(page, 'folder-1', 'auth-mode-switch-folder', true);
+
+    // Open the folder settings tab.
+    await page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).dblclick();
+    await page.locator('.tab.auth').click();
+
+    await test.step('Save Bearer at the folder level', async () => {
+      await selectAuthMode(page, 'Bearer Token');
+      await typeIntoField(page, 'Token', 'folder-bearer-token');
+      await page.getByRole('button', { name: 'Save' }).click();
+    });
+
+    await test.step('Bearer → Basic → Bearer restores the saved folder token', async () => {
+      await selectAuthMode(page, 'Basic Auth');
+      await selectAuthMode(page, 'Bearer Token');
+
+      await expect.poll(() => readField(page, 'Token')).toBe('folder-bearer-token');
+    });
+  });
+});