diff --git a/packages/playwright-core/src/server/chromium/chromium.ts b/packages/playwright-core/src/server/chromium/chromium.ts
index f2dfb7b2aba96..ba4b73903d17d 100644
--- a/packages/playwright-core/src/server/chromium/chromium.ts
+++ b/packages/playwright-core/src/server/chromium/chromium.ts
@@ -304,8 +304,11 @@ export class Chromium extends BrowserType {
       // See https://issues.chromium.org/issues/40277080
       chromeArguments.push('--enable-unsafe-swiftshader');
       // See https://bugs.chromium.org/p/chromium/issues/detail?id=1407025.
-      if (options.headless && (!options.channel || options.channel === 'chromium-headless-shell'))
-        chromeArguments.push('--use-angle');
+      if (options.headless && (!options.channel || options.channel === 'chromium-headless-shell' || options.channel === 'chromium-tip-of-tree-headless-shell')) {
+        // See also https://github.com/microsoft/playwright/issues/30585
+        // and chromium fix at https://issues.chromium.org/issues/338414704.
+        chromeArguments.push('--enable-gpu');
+      }
     }
 
     if (options.devtools)