diff --git a/__e2e__/setupApp.yml b/__e2e__/setupApp.yml
index 9c6eba9757..0ca2cdb147 100644
--- a/__e2e__/setupApp.yml
+++ b/__e2e__/setupApp.yml
@@ -26,13 +26,7 @@ appId: xyz.blueskyweb.app
           timeout: 180000
       - tapOn: "Continue"
       - back
-- extendedWaitUntil:
-    visible:
-      id: e2eConfigureProxy
-    timeout: 180000
-- tapOn:
-    id: e2eConfigureProxy
 - extendedWaitUntil:
     visible:
       id: e2eSignInAlice
-    timeout: 30000
+    timeout: 180000
diff --git a/src/view/com/testing/TestCtrls.e2e.tsx b/src/view/com/testing/TestCtrls.e2e.tsx
index f6010921ab..c847a33657 100644
--- a/src/view/com/testing/TestCtrls.e2e.tsx
+++ b/src/view/com/testing/TestCtrls.e2e.tsx
@@ -1,4 +1,4 @@
-import {useState} from 'react'
+import {useEffect, useState} from 'react'
 import {LogBox, Pressable, View} from 'react-native'
 import {useQueryClient} from '@tanstack/react-query'
 
@@ -37,6 +37,13 @@ export function TestCtrls() {
   const onboardingDispatch = useOnboardingDispatch()
   const {setShowLoggedOut} = useLoggedOutViewControls()
   const [isProxyConfigured, setIsProxyConfigured] = useState(hasConfiguredProxy)
+  useEffect(() => {
+    const header = `${DEV_ENV_APPVIEW_DID}#bsky_appview`
+    BLUESKY_PROXY_HEADER.set(header)
+    agent.configureProxy(header as any)
+    hasConfiguredProxy = true
+    setIsProxyConfigured(true)
+  }, [agent])
   const onPressSignInAlice = async () => {
     console.info('[E2E] Signing in as Alice')
     await login(
@@ -61,21 +68,8 @@ export function TestCtrls() {
     )
     setShowLoggedOut(false)
   }
-  const configureProxy = () => {
-    const header = `${DEV_ENV_APPVIEW_DID}#bsky_appview`
-    BLUESKY_PROXY_HEADER.set(header)
-    agent.configureProxy(header as any)
-    hasConfiguredProxy = true
-    setIsProxyConfigured(true)
-  }
   return (
     <View style={{position: 'absolute', top: 100, right: 0, zIndex: 100}}>
-      <Pressable
-        testID="e2eConfigureProxy"
-        onPress={configureProxy}
-        accessibilityRole="button"
-        style={BTN}
-      />
       {isProxyConfigured && (
         <>
           <Pressable