diff --git a/lib/houston/conversations/listener.rb b/lib/houston/conversations/listener.rb
index <HASH>..<HASH> 100644
--- a/lib/houston/conversations/listener.rb
+++ b/lib/houston/conversations/listener.rb
@@ -7,7 +7,7 @@ module Houston
 
       def matches_context?(message)
         contexts = message.contexts.dup
-        contexts << :conversation if conversation && conversation.includes?(message)
+        contexts << :conversation if conversation && conversation.includes?(message.original_message)
 
         return false unless contexts.superset? @required_contexts
         return false unless contexts.disjoint? @prohibited_contexts
[fix] Passed original_message (that responds to `channel` and `sender`) to Conversation#includes? (6m) {{err:<I>}}