diff --git a/enterprise/app/services/captain/assistant/session_capture_service.rb b/enterprise/app/services/captain/assistant/session_capture_service.rb
index 4de594883..3927faefa 100644
--- a/enterprise/app/services/captain/assistant/session_capture_service.rb
+++ b/enterprise/app/services/captain/assistant/session_capture_service.rb
@@ -74,11 +74,8 @@ class Captain::Assistant::SessionCaptureService
   # (assistant replies, tool calls/results, handoff hops).
   def current_turn_history
     history = Array(context[:conversation_history])
-    turn_start_index = context[:captain_v2_turn_start_index]
-    return history[turn_start_index..] if turn_start_index
-
-    last_user_index = history.rindex { |message| message[:role].to_s == 'user' }
-    current_turn = last_user_index ? history[last_user_index..] : history
+    turn_start_index = context[:captain_v2_turn_start_index] || history.rindex { |message| message[:role].to_s == 'user' } || 0
+    current_turn = history[turn_start_index..]
 
     current_turn.map do |message|
       content = message[:content]