diff --git a/enterprise/lib/captain/tools/base_public_tool.rb b/enterprise/lib/captain/tools/base_public_tool.rb
index e53f7a0f1..e1f779b36 100644
--- a/enterprise/lib/captain/tools/base_public_tool.rb
+++ b/enterprise/lib/captain/tools/base_public_tool.rb
@@ -24,14 +24,14 @@ class Captain::Tools::BasePublicTool < Agents::Tool
   end
 
   def find_conversation(state)
-    conversation_id = state[:conversation][:id]
+    conversation_id = state&.dig(:conversation, :id)
     return nil unless conversation_id
 
     account_scoped(::Conversation).find_by(id: conversation_id)
   end
 
   def find_contact(state)
-    contact_id = state[:contact][:id]
+    contact_id = state&.dig(:contact, :id)
     return nil unless contact_id
 
     account_scoped(::Contact).find_by(id: contact_id)