diff --git a/enterprise/listeners/captain_listener.rb b/enterprise/listeners/captain_listener.rb
index da77bfbaa..418e0ca2b 100644
--- a/enterprise/listeners/captain_listener.rb
+++ b/enterprise/listeners/captain_listener.rb
@@ -1,9 +1,7 @@
 class CaptainListener < BaseListener
   def conversation_resolved(event)
     conversation = extract_conversation_and_account(event)[0]
-    assistant = conversation.inbox.captain_assistant
-
-    return if assistant.blank?
+    return unless conversation.inbox.captain_active?
 
     Captain::Llm::ContactNotesService.new(assistant, conversation).generate_and_update_notes if assistant.config['feature_memory'].present?
     Captain::Llm::ConversationFaqService.new(assistant, conversation).generate_and_deduplicate if assistant.config['feature_faq'].present?