diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py
index 169c475af9..9819c73d37 100644
--- a/api/controllers/service_api/wraps.py
+++ b/api/controllers/service_api/wraps.py
@@ -49,10 +49,7 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
 
             kwargs['app_model'] = app_model
 
-            if not fetch_user_arg:
-                # use default-user
-                user_id = None
-            else:
+            if fetch_user_arg:
                 if fetch_user_arg.fetch_from == WhereisUserArg.QUERY:
                     user_id = request.args.get('user')
                 elif fetch_user_arg.fetch_from == WhereisUserArg.JSON:
@@ -66,7 +63,10 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio
                 if not user_id and fetch_user_arg.required:
                     raise ValueError("Arg user must be provided.")
 
-            kwargs['end_user'] = create_or_update_end_user_for_user_id(app_model, user_id)
+                if user_id:
+                    user_id = str(user_id)
+
+                kwargs['end_user'] = create_or_update_end_user_for_user_id(app_model, user_id)
 
             return view_func(*args, **kwargs)
         return decorated_view
diff --git a/api/core/app_runner/generate_task_pipeline.py b/api/core/app_runner/generate_task_pipeline.py
index 20e4bc7992..5fd635bc3b 100644
--- a/api/core/app_runner/generate_task_pipeline.py
+++ b/api/core/app_runner/generate_task_pipeline.py
@@ -175,7 +175,7 @@ class GenerateTaskPipeline:
                     'id': self._message.id,
                     'message_id': self._message.id,
                     'mode': self._conversation.mode,
-                    'answer': event.llm_result.message.content,
+                    'answer': self._task_state.llm_result.message.content,
                     'metadata': {},
                     'created_at': int(self._message.created_at.timestamp())
                 }