diff --git a/electron/tests/e2e/thread.e2e.spec.ts b/electron/tests/e2e/thread.e2e.spec.ts
index bc7acf281..9a69c36a4 100644
--- a/electron/tests/e2e/thread.e2e.spec.ts
+++ b/electron/tests/e2e/thread.e2e.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test'
 import { page, test, TIMEOUT } from '../config/fixtures'
 
-test('Select GPT model for chat via Use model button from Jan Hub', async ({ hubPage }) => {
+test('Select GPT model from Hub and Chat with Invalid API Key', async ({ hubPage }) => {
   await hubPage.navigateByMenu()
   await hubPage.verifyContainerVisible()
 
@@ -23,6 +23,8 @@ test('Select GPT model for chat via Use model button from Jan Hub', async ({ hub
     .getByTestId('btn-send-chat')
     .click()
 
+  await page.waitForSelector('[data-testid$="-loader"]', { state: 'hidden', timeout: TIMEOUT });
+
   const APIKeyError = page.getByTestId('invalid-API-key-error')
   await expect(APIKeyError).toBeVisible({
     timeout: TIMEOUT,
diff --git a/web/containers/Loader/GenerateResponse.tsx b/web/containers/Loader/GenerateResponse.tsx
index 457c44987..844123dd2 100644
--- a/web/containers/Loader/GenerateResponse.tsx
+++ b/web/containers/Loader/GenerateResponse.tsx
@@ -31,6 +31,7 @@ export default function GenerateResponse() {
         <div
           className="absolute left-0 top-0 h-full bg-gray-200"
           style={{ width: `${loader}%` }}
+          data-testid="response-loader"
         />
         <span className="relative z-10">Generating response...</span>
       </div>
diff --git a/web/containers/Loader/ModelStart.tsx b/web/containers/Loader/ModelStart.tsx
index f7bc04481..126044e01 100644
--- a/web/containers/Loader/ModelStart.tsx
+++ b/web/containers/Loader/ModelStart.tsx
@@ -40,6 +40,7 @@ export default function ModelStart() {
         <div
           className="absolute left-0 top-0 h-full bg-blue-200"
           style={{ width: `${loader}%` }}
+          data-testid="model-loader"
         />
         <span className="relative z-10">
           {stateModel.state === 'start' ? 'Starting' : 'Stopping'}