@@ -4,6 +4,7 @@ import type { ElementReference } from '@wdio/protocols'
 import { getElementFromResponse } from '../../utils/index.js'
 import { bidiDisabledSelectError, bidiSelectByAttribute, isBidiCommandsEnabled, type BidiDisabledSource } from '../../utils/bidi/elementCommands.js'
 import { getBrowserObject } from '@wdio/utils'
+import { escapeXPathString } from '../../utils/findStrategy.js'
 
 /**
  *
@@ -71,7 +72,7 @@ export async function selectByAttribute (
     /**
     * find option elememnt using xpath
     */
-    const normalized = `[normalize-space(@${attribute.trim()}) = "${value.trim()}"]`
+    const normalized = `[normalize-space(@${attribute.trim()}) = ${escapeXPathString(value.trim())}]`
     let optionElement: ElementReference | undefined
     await this.waitUntil(async () => {
         optionElement = await this.findElementFromElement(
 
@@ -103,6 +103,30 @@ describe('selectByAttribute test', () => {
         })
     })
 
+    it.each([
+        { value: '12" monitor', literal: '\'12" monitor\'' },
+        { value: "John's monitor", literal: '"John\'s monitor"' },
+        { value: 'John\'s 12" monitor', literal: 'concat("John\'s 12", \'"\', " monitor")' },
+        { value: '"John\'s monitor"', literal: 'concat(\'"\', "John\'s monitor", \'"\')' }
+    ])('should select an attribute value containing quotes: $value', async ({ value, literal }) => {
+        await elem.selectByAttribute('value', ` ${value} `)
+
+        const predicate = `[normalize-space(@value) = ${literal}]`
+        expect(fetch).toHaveBeenCalledWith(
+            expect.objectContaining({ pathname: '/session/foobar-123/element/some-elem-123/element' }),
+            expect.objectContaining({
+                body: JSON.stringify({
+                    using: 'xpath',
+                    value: `./option${predicate}|./optgroup/option${predicate}`
+                })
+            })
+        )
+        expect(fetch).toHaveBeenCalledWith(
+            expect.objectContaining({ pathname: '/session/foobar-123/element/some-sub-elem-321/click' }),
+            expect.objectContaining({ method: 'POST' })
+        )
+    })
+
     it('should throw if option is not found', async () => {
         const mockElem = {
             options: {},