diff --git a/apps/web/ce/store/issue/issue-details/activity.store.ts b/apps/web/ce/store/issue/issue-details/activity.store.ts
index e2543a1ac56..ab86bc1c1c2 100644
--- a/apps/web/ce/store/issue/issue-details/activity.store.ts
+++ b/apps/web/ce/store/issue/issue-details/activity.store.ts
@@ -46,7 +46,6 @@ export class IssueActivityStore implements IIssueActivityStore {
   loader: TActivityLoader = "fetch";
   activities: TIssueActivityIdMap = {};
   activityMap: TIssueActivityMap = {};
-
   // services
   serviceType;
   issueActivityService;
@@ -79,10 +78,10 @@ export class IssueActivityStore implements IIssueActivityStore {
     return this.activityMap[activityId] ?? undefined;
   };
 
-  getActivityAndCommentsByIssueId = computedFn((issueId: string, sortOrder: E_SORT_ORDER) => {
+  protected buildActivityAndCommentItems(issueId: string): TIssueActivityComment[] | undefined {
     if (!issueId) return undefined;
 
-    let activityComments: TIssueActivityComment[] = [];
+    const activityComments: TIssueActivityComment[] = [];
 
     const currentStore =
       this.serviceType === EIssueServiceType.EPICS ? this.store.issue.epicDetail : this.store.issue.issueDetail;
@@ -92,17 +91,25 @@ export class IssueActivityStore implements IIssueActivityStore {
 
     if (!activities || !comments) return undefined;
 
-    activities?.forEach((activityId) => {
+    activities.forEach((activityId) => {
       const activity = this.getActivityById(activityId);
       if (!activity) return;
+      const type =
+        activity.field === "state"
+          ? EActivityFilterType.STATE
+          : activity.field === "assignees"
+            ? EActivityFilterType.ASSIGNEE
+            : activity.field === null
+              ? EActivityFilterType.DEFAULT
+              : EActivityFilterType.ACTIVITY;
       activityComments.push({
         id: activity.id,
-        activity_type: EActivityFilterType.ACTIVITY,
+        activity_type: type,
         created_at: activity.created_at,
       });
     });
 
-    comments?.forEach((commentId) => {
+    comments.forEach((commentId) => {
       const comment = currentStore.comment.getCommentById(commentId);
       if (!comment) return;
       activityComments.push({
@@ -112,9 +119,17 @@ export class IssueActivityStore implements IIssueActivityStore {
       });
     });
 
-    activityComments = orderBy(activityComments, (e) => new Date(e.created_at || 0), sortOrder);
-
     return activityComments;
+  }
+
+  protected sortActivityComments(items: TIssueActivityComment[], sortOrder: E_SORT_ORDER): TIssueActivityComment[] {
+    return orderBy(items, (e) => new Date(e.created_at || 0), sortOrder);
+  }
+
+  getActivityAndCommentsByIssueId = computedFn((issueId: string, sortOrder: E_SORT_ORDER) => {
+    const baseItems = this.buildActivityAndCommentItems(issueId);
+    if (!baseItems) return undefined;
+    return this.sortActivityComments(baseItems, sortOrder);
   });
 
   // actions
diff --git a/apps/web/core/components/issues/issue-detail/issue-activity/activity-comment-root.tsx b/apps/web/core/components/issues/issue-detail/issue-activity/activity-comment-root.tsx
index 08e25be4293..24b7627888f 100644
--- a/apps/web/core/components/issues/issue-detail/issue-activity/activity-comment-root.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-activity/activity-comment-root.tsx
@@ -2,7 +2,7 @@ import type { FC } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import type { E_SORT_ORDER, TActivityFilters } from "@plane/constants";
-import { filterActivityOnSelectedFilters } from "@plane/constants";
+import { EActivityFilterType, filterActivityOnSelectedFilters } from "@plane/constants";
 import type { TCommentsOperations } from "@plane/types";
 // components
 import { CommentCard } from "@/components/comments/card/root";
@@ -53,6 +53,13 @@ export const IssueActivityCommentRoot: FC<TIssueActivityCommentRoot> = observer(
 
   const filteredActivityAndComments = filterActivityOnSelectedFilters(activityAndComments, selectedFilters);
 
+  const BASE_ACTIVITY_FILTER_TYPES = [
+    EActivityFilterType.ACTIVITY,
+    EActivityFilterType.STATE,
+    EActivityFilterType.ASSIGNEE,
+    EActivityFilterType.DEFAULT,
+  ];
+
   return (
     <div>
       {filteredActivityAndComments.map((activityComment, index) => {
@@ -69,7 +76,7 @@ export const IssueActivityCommentRoot: FC<TIssueActivityCommentRoot> = observer(
             disabled={disabled}
             projectId={projectId}
           />
-        ) : activityComment.activity_type === "ACTIVITY" ? (
+        ) : BASE_ACTIVITY_FILTER_TYPES.includes(activityComment.activity_type as EActivityFilterType) ? (
           <IssueActivityItem
             activityId={activityComment.id}
             ends={index === 0 ? "top" : index === filteredActivityAndComments.length - 1 ? "bottom" : undefined}
diff --git a/packages/constants/src/issue/filter.ts b/packages/constants/src/issue/filter.ts
index ba97fde3ef6..90679a4c86c 100644
--- a/packages/constants/src/issue/filter.ts
+++ b/packages/constants/src/issue/filter.ts
@@ -308,17 +308,28 @@ export const SUB_WORK_ITEM_AVAILABLE_FILTERS_FOR_WORK_ITEM_PAGE: (keyof IIssueFi
 export enum EActivityFilterType {
   ACTIVITY = "ACTIVITY",
   COMMENT = "COMMENT",
+  STATE = "STATE",
+  ASSIGNEE = "ASSIGNEE",
+  DEFAULT = "DEFAULT",
 }
 
 export type TActivityFilters = EActivityFilterType;
 
-export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<TActivityFilters, { labelTranslationKey: string }> = {
+export type TActivityFilterOptionsKey = Exclude<TActivityFilters, EActivityFilterType.DEFAULT>;
+
+export const ACTIVITY_FILTER_TYPE_OPTIONS: Record<TActivityFilterOptionsKey, { labelTranslationKey: string }> = {
   [EActivityFilterType.ACTIVITY]: {
     labelTranslationKey: "common.updates",
   },
   [EActivityFilterType.COMMENT]: {
     labelTranslationKey: "common.comments",
   },
+  [EActivityFilterType.STATE]: {
+    labelTranslationKey: "common.state",
+  },
+  [EActivityFilterType.ASSIGNEE]: {
+    labelTranslationKey: "common.assignee",
+  },
 };
 
 export type TActivityFilterOption = {
@@ -328,12 +339,21 @@ export type TActivityFilterOption = {
   onClick: () => void;
 };
 
-export const defaultActivityFilters: TActivityFilters[] = [EActivityFilterType.ACTIVITY, EActivityFilterType.COMMENT];
+export const defaultActivityFilters: TActivityFilters[] = [
+  EActivityFilterType.ACTIVITY,
+  EActivityFilterType.COMMENT,
+  EActivityFilterType.STATE,
+  EActivityFilterType.ASSIGNEE,
+  EActivityFilterType.DEFAULT,
+];
 
 export const filterActivityOnSelectedFilters = (
   activity: TIssueActivityComment[],
   filters: TActivityFilters[]
 ): TIssueActivityComment[] =>
-  activity.filter((activity) => filters.includes(activity.activity_type as TActivityFilters));
+  activity.filter((activity) => {
+    if (activity.activity_type === EActivityFilterType.DEFAULT) return true;
+    return filters.includes(activity.activity_type as TActivityFilters);
+  });
 
 export const ENABLE_ISSUE_DEPENDENCIES = false;
diff --git a/packages/propel/src/toast/toast.stories.tsx b/packages/propel/src/toast/toast.stories.tsx
index 607100497ce..475cde44d78 100644
--- a/packages/propel/src/toast/toast.stories.tsx
+++ b/packages/propel/src/toast/toast.stories.tsx
@@ -1,6 +1,6 @@
+import { useState } from "react";
 import type { Meta, StoryObj } from "@storybook/react-vite";
 import { Toast, setToast, updateToast, setPromiseToast, TOAST_TYPE } from "./toast";
-import { useState } from "react";
 
 const meta = {
   title: "Components/Toast",
diff --git a/packages/types/src/issues/activity/base.ts b/packages/types/src/issues/activity/base.ts
index 7b649334958..e239ef9f012 100644
--- a/packages/types/src/issues/activity/base.ts
+++ b/packages/types/src/issues/activity/base.ts
@@ -56,6 +56,21 @@ export type TIssueActivityComment =
       activity_type: "ACTIVITY";
       created_at?: string;
     }
+  | {
+      id: string;
+      activity_type: "STATE";
+      created_at?: string;
+    }
+  | {
+      id: string;
+      activity_type: "ASSIGNEE";
+      created_at?: string;
+    }
+  | {
+      id: string;
+      activity_type: "DEFAULT";
+      created_at?: string;
+    }
   | {
       id: string;
       activity_type: "WORKLOG";