diff --git a/listeners/assistant/assistant.py b/listeners/assistant/assistant.py
index 320d41f..ac43dc8 100644
--- a/listeners/assistant/assistant.py
+++ b/listeners/assistant/assistant.py
@@ -67,9 +67,9 @@ def respond_in_assistant_thread(
 ):
     try:
         channel_id = payload["channel"]
-        team_id = payload["team"]
+        team_id = context.team_id
         thread_ts = payload["thread_ts"]
-        user_id = payload["user"]
+        user_id = context.user_id
         user_message = payload["text"]
 
         set_status(