diff --git a/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt b/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
index 1da8dc3a2d..ec0eed0cbe 100644
--- a/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
@@ -1509,9 +1509,10 @@ class RegistrationEndToEndTest {
   @Suppress("DEPRECATION")
   private fun solveCaptcha(token: String) {
     var webView: WebView? = null
+    // Matched with onAllNodesWithTag so that an absent screen fails the condition and is retried, rather than throwing out of the wait
     waitFor("the captcha WebView") {
-      val composeView = (composeTestRule.onNodeWithTag(TestTags.CAPTCHA_SCREEN).fetchSemanticsNode().root as ViewRootForTest).view
-      webView = findWebView(composeView)
+      val composeView = (composeTestRule.onAllNodesWithTag(TestTags.CAPTCHA_SCREEN).fetchSemanticsNodes().firstOrNull()?.root as? ViewRootForTest)?.view
+      webView = composeView?.let { findWebView(it) }
       webView != null
     }
     webView!!.let { Shadows.shadowOf(it).webViewClient.shouldOverrideUrlLoading(it, "signalcaptcha://$token") }