diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
index 06a700f1e0..680905506c 100644
--- a/client/src/app/api/models.ts
+++ b/client/src/app/api/models.ts
@@ -306,21 +306,21 @@ export type TaskState =
   | "Postponed";
 
 export interface Task {
-  id?: number;
+  id: number;
   createUser?: string;
   updateUser?: string;
   createTime?: string;
 
-  name: string;
-  kind: string;
-  addon: string;
-  extensions: string[];
+  name?: string;
+  kind?: string;
+  addon?: string;
+  extensions?: string[];
   state?: TaskState;
   locator?: string;
   priority?: number;
-  policy: TaskPolicy;
-  ttl: TTL;
-  data: TaskData;
+  policy?: TaskPolicy;
+  ttl?: TTL;
+  data?: TaskData;
   application: Ref;
   bucket?: Ref;
   pod?: string;
@@ -406,9 +406,10 @@ export interface TaskgroupTask {
 }
 
 export interface Taskgroup {
-  id?: number;
+  id: number;
   name: string;
-  addon: string;
+  kind?: string;
+  addon?: string;
   data: TaskData;
   tasks: TaskgroupTask[];
 }
diff --git a/client/src/app/api/rest.ts b/client/src/app/api/rest.ts
index bbc5f77d8d..1c0e8c0b9d 100644
--- a/client/src/app/api/rest.ts
+++ b/client/src/app/api/rest.ts
@@ -373,7 +373,7 @@ export const getTaskQueue = (addon?: string): Promise<TaskQueue> =>
     .get<TaskQueue>(`${TASKS}/report/queue`, { params: { addon } })
     .then(({ data }) => data);
 
-export const createTaskgroup = (obj: Taskgroup) =>
+export const createTaskgroup = (obj: New<Taskgroup>) =>
   axios.post<Taskgroup>(TASKGROUPS, obj).then((response) => response.data);
 
 export const submitTaskgroup = (obj: Taskgroup) =>
diff --git a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
index f13cc2fb20..64f784393d 100644
--- a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
@@ -14,6 +14,7 @@ import { useTranslation } from "react-i18next";
 
 import {
   Application,
+  New,
   TaskData,
   Taskgroup,
   TaskgroupTask,
@@ -70,9 +71,9 @@ const defaultTaskData: TaskData = {
   },
 };
 
-export const defaultTaskgroup: Taskgroup = {
+export const defaultTaskgroup: New<Taskgroup> = {
   name: `taskgroup.analyzer`,
-  addon: "analyzer",
+  kind: "analyzer",
   data: {
     ...defaultTaskData,
   },
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 8ced4d2be7..9e7f67a7d8 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -148,7 +148,7 @@ export const ApplicationsTable: React.FC = () => {
     tasks.find((task: Task) => task.application?.id === application.id);
 
   const { tasks, hasActiveTasks } = useFetchTasks(
-    { addon: "analyzer" },
+    { kind: "analyzer", addon: "analyzer" },
     isAnalyzeModalOpen
   );
 
diff --git a/client/src/app/queries/tasks.ts b/client/src/app/queries/tasks.ts
index 6fbddbbeb1..adaa5f3b12 100644
--- a/client/src/app/queries/tasks.ts
+++ b/client/src/app/queries/tasks.ts
@@ -20,6 +20,7 @@ import {
 
 interface FetchTasksFilters {
   addon?: string;
+  kind?: string;
 }
 
 export const TasksQueryKey = "tasks";
@@ -38,7 +39,16 @@ export const useFetchTasks = (
     select: (allTasks) => {
       const uniqSorted = allTasks
         .filter((task) =>
-          filters?.addon ? filters.addon === task.addon : true
+          // If there are any tasks with the addon field, we will still need to consider those older
+          // tasks that do not have the kind field. This is because the kind field was added later and is
+          // preferred over the addon field.
+
+          // The task manager will determine and assign the addon field when the addon is specified and addon isnt
+          // which will result in both being set.
+
+          filters?.kind || filters?.addon
+            ? filters.kind === task.kind || filters.addon === task.addon
+            : true
         )
         // sort by application.id (ascending) then createTime (newest to oldest)
         .sort((a, b) =>