diff --git a/enterprise/lib/captain/tools/handoff_tool.rb b/enterprise/lib/captain/tools/handoff_tool.rb
index 4301a53f9..7f0372709 100644
--- a/enterprise/lib/captain/tools/handoff_tool.rb
+++ b/enterprise/lib/captain/tools/handoff_tool.rb
@@ -24,8 +24,6 @@ class Captain::Tools::HandoffTool < Captain::Tools::BasePublicTool
   private
 
   def trigger_handoff(conversation, reason)
-    Current.executed_by = @assistant
-
     # post the reason as a private note
     conversation.messages.create!(
       message_type: :outgoing,
@@ -36,10 +34,7 @@ class Captain::Tools::HandoffTool < Captain::Tools::BasePublicTool
       content: reason
     )
 
-    # Trigger the bot handoff (sets status to open + dispatches events)
     conversation.bot_handoff!
-  ensure
-    Current.executed_by = nil
   end
 
   # TODO: Future enhancement - Add team assignment capability