diff --git a/src/chat/planner_actions/plan_filter.py b/src/chat/planner_actions/plan_filter.py
index d76f1aa04..838320700 100644
--- a/src/chat/planner_actions/plan_filter.py
+++ b/src/chat/planner_actions/plan_filter.py
@@ -263,8 +263,7 @@ class PlanFilter:
                     target_message_dict = self._get_latest_message(message_id_list)
 
                 if target_message_dict:
-                    from src.common.data_models.database_data_model import DatabaseMessages
-                    target_message_obj = DatabaseMessages(**target_message_dict)
+                    target_message_obj = target_message_dict
 
             available_action_names = list(plan.available_actions.keys())
             if action not in ["no_action", "no_reply", "reply", "do_nothing", "proactive_reply"] and action not in available_action_names:
diff --git a/src/common/data_models/info_data_model.py b/src/common/data_models/info_data_model.py
index 2806587c1..32893706d 100644
--- a/src/common/data_models/info_data_model.py
+++ b/src/common/data_models/info_data_model.py
@@ -21,7 +21,7 @@ class ActionPlannerInfo(BaseDataModel):
     action_type: str = field(default_factory=str)
     reasoning: Optional[str] = None
     action_data: Optional[Dict] = None
-    action_message: Optional["DatabaseMessages"] = None
+    action_message: Optional[Dict] = None
     available_actions: Optional[Dict[str, "ActionInfo"]] = None