diff --git a/images/chromium-headless/image/wrapper.sh b/images/chromium-headless/image/wrapper.sh
index 9937e3cf..897fe5e7 100755
--- a/images/chromium-headless/image/wrapper.sh
+++ b/images/chromium-headless/image/wrapper.sh
@@ -62,7 +62,7 @@ if [ -z "${CHROMIUM_FLAGS:-}" ]; then
     --disable-crash-reporter \
     --disable-crashpad \
     --disable-dev-shm-usage \
-    --disable-features=AcceptCHFrame,AutoExpandDetailsElement,AvoidUnnecessaryBeforeUnloadCheckSync,CertificateTransparencyComponentUpdater,DeferRendererTasksAfterInput,DestroyProfileOnBrowserClose,DialMediaRouteProvider,ExtensionManifestV2Disabled,GlobalMediaControls,HttpsUpgrades,ImprovedCookieControls,LazyFrameLoading,LensOverlay,MediaRouter,PaintHolding,ThirdPartyStoragePartitioning,Translate \
+    --disable-features=AcceptCHFrame,AutoExpandDetailsElement,AvoidUnnecessaryBeforeUnloadCheckSync,CertificateTransparencyComponentUpdater,DeferRendererTasksAfterInput,DestroyProfileOnBrowserClose,DialMediaRouteProvider,ExtensionManifestV2Disabled,GlobalMediaControls,HttpsUpgrades,ImprovedCookieControls,LazyFrameLoading,LensOverlay,MediaRouter,PaintHolding,ThirdPartyStoragePartitioning,Translate,WebAuthenticationConditionalUI \
     --disable-field-trial-config \
     --disable-gcm-registration \
     --disable-gpu \
diff --git a/server/cmd/chromium-launcher/main.go b/server/cmd/chromium-launcher/main.go
index 8c83ece5..6aad6056 100644
--- a/server/cmd/chromium-launcher/main.go
+++ b/server/cmd/chromium-launcher/main.go
@@ -62,6 +62,7 @@ func main() {
 		"--user-data-dir=/home/kernel/user-data",
 		"--password-store=basic",
 		"--no-first-run",
+		"--disable-features=WebAuthenticationConditionalUI",
 	}
 	if *headless {
 		chromiumArgs = append([]string{"--headless=new"}, chromiumArgs...)