diff --git a/web-app/src/lib/completion.ts b/web-app/src/lib/completion.ts
index 0850f5665..68cc7183c 100644
--- a/web-app/src/lib/completion.ts
+++ b/web-app/src/lib/completion.ts
@@ -175,10 +175,13 @@ export const sendCompletion = async (
     try {
       const bytes = CryptoJS.AES.decrypt(encryptedKey, key)
       const decryptedKey = bytes.toString(CryptoJS.enc.Utf8)
-      return decryptedKey || encryptedKey // Return original if decryption fails
+      if (!decryptedKey) {
+        throw new Error('Failed to decrypt API key: result is empty')
+      }
+      return decryptedKey
     } catch (error) {
-      console.warn('Failed to decrypt API key, using original value:', error)
-      return encryptedKey
+      console.warn('Failed to decrypt API key:', error)
+      throw new Error('Failed to decrypt API key')
     }
   }
   if (!secretKey) {