diff --git a/electron/tests/e2e/thread.e2e.spec.ts b/electron/tests/e2e/thread.e2e.spec.ts
index 5d7328053..dfd131988 100644
--- a/electron/tests/e2e/thread.e2e.spec.ts
+++ b/electron/tests/e2e/thread.e2e.spec.ts
@@ -25,7 +25,7 @@ test('Select GPT model from Hub and Chat with Invalid API Key', async ({
     { timeout: TIMEOUT }
   )
 
-  const APIKeyError = page.getByTestId('invalid-API-key-error')
+  const APIKeyError = page.getByTestId('passthrough-error-message')
   await expect(APIKeyError).toBeVisible({
     timeout: TIMEOUT,
   })
diff --git a/web/containers/ErrorMessage/index.tsx b/web/containers/ErrorMessage/index.tsx
index be26ad44a..532f02259 100644
--- a/web/containers/ErrorMessage/index.tsx
+++ b/web/containers/ErrorMessage/index.tsx
@@ -29,7 +29,6 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
     switch (message.error_code) {
       case ErrorCode.InvalidApiKey:
       case ErrorCode.AuthenticationError:
-      case ErrorCode.InvalidRequestError:
         return (
           <span data-testid="invalid-API-key-error">
             Invalid API key. Please check your API key from{' '}
@@ -53,7 +52,7 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
         )
       default:
         return (
-          <p>
+          <p data-testid="passthrough-error-message">
             {message.content[0]?.text?.value && (
               <AutoLink text={message.content[0].text.value} />
             )}