diff --git a/mobile/src/session/use-mobile-native-chat-image-upload.ts b/mobile/src/session/use-mobile-native-chat-image-upload.ts
index 655bd5906d3..01567b5c727 100644
--- a/mobile/src/session/use-mobile-native-chat-image-upload.ts
+++ b/mobile/src/session/use-mobile-native-chat-image-upload.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState } from 'react'
+import { useCallback, useLayoutEffect, useRef, useState } from 'react'
 import { CLIPBOARD_IMAGE_TOO_LARGE_ERROR } from '../../../src/shared/clipboard-image'
 import type { RpcClient } from '../transport/rpc-client'
 import type { ConnectionState } from '../transport/types'
@@ -46,7 +46,9 @@ export function useMobileNativeChatImageUpload(args: {
   const [isAttaching, setIsAttaching] = useState(false)
   const attachingCount = useRef(0)
   const connStateRef = useRef(connState)
-  connStateRef.current = connState
+  useLayoutEffect(() => {
+    connStateRef.current = connState
+  }, [connState])
 
   const attachImage = useCallback(
     async (source: MobileImageSource): Promise<void> => {
diff --git a/mobile/src/session/use-mobile-structured-agent-state.ts b/mobile/src/session/use-mobile-structured-agent-state.ts
index d29153b44f4..4c73f6f0c47 100644
--- a/mobile/src/session/use-mobile-structured-agent-state.ts
+++ b/mobile/src/session/use-mobile-structured-agent-state.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import type {
   AgentSessionHistoryResult,
   AgentSessionSubscribeEvent
@@ -37,7 +37,9 @@ export function useMobileStructuredAgentState(args: {
   const [state, setState] = useState<StructuredAgentSessionState>(EMPTY_STRUCTURED_AGENT_SESSION)
   const [loadingOlder, setLoadingOlder] = useState(false)
   const stateRef = useRef(state)
-  stateRef.current = state
+  useLayoutEffect(() => {
+    stateRef.current = state
+  }, [state])
 
   const apply = useCallback((action: StructuredAgentSessionAction) => {
     setState((current) => reduceStructuredAgentSession(current, action))