diff --git a/apps/app/components/core/existing-issues-list-modal.tsx b/apps/app/components/core/existing-issues-list-modal.tsx
index 324ec5c30..4d9ec5909 100644
--- a/apps/app/components/core/existing-issues-list-modal.tsx
+++ b/apps/app/components/core/existing-issues-list-modal.tsx
@@ -1,11 +1,16 @@
 import React, { useState } from "react";
 
-// headless ui
-import { Combobox, Dialog, Transition } from "@headlessui/react";
+import { useRouter } from "next/router";
+
+import { mutate } from "swr";
+
 // react-hook-form
 import { Controller, SubmitHandler, useForm } from "react-hook-form";
+// headless ui
+import { Combobox, Dialog, Transition } from "@headlessui/react";
 // hooks
 import useToast from "hooks/use-toast";
+import useIssuesView from "hooks/use-issues-view";
 // ui
 import { PrimaryButton, SecondaryButton } from "components/ui";
 // icons
@@ -13,6 +18,8 @@ import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
 import { LayerDiagonalIcon } from "components/icons";
 // types
 import { IIssue } from "types";
+// fetch-keys
+import { CYCLE_ISSUES_WITH_PARAMS, MODULE_ISSUES_WITH_PARAMS } from "constants/fetch-keys";
 
 type FormInput = {
   issues: string[];
@@ -33,8 +40,13 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
 }) => {
   const [query, setQuery] = useState("");
 
+  const router = useRouter();
+  const { cycleId, moduleId } = router.query;
+
   const { setToastAlert } = useToast();
 
+  const { params } = useIssuesView();
+
   const handleClose = () => {
     onClose();
     setQuery("");
@@ -64,6 +76,9 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
     }
 
     await handleOnSubmit(data);
+    if (cycleId) mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
+    if (moduleId) mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+
     handleClose();
 
     setToastAlert({
diff --git a/apps/app/components/issues/modal.tsx b/apps/app/components/issues/modal.tsx
index 6ee65c9c0..0f0b86263 100644
--- a/apps/app/components/issues/modal.tsx
+++ b/apps/app/components/issues/modal.tsx
@@ -23,13 +23,12 @@ import type { IIssue } from "types";
 import {
   PROJECT_ISSUES_DETAILS,
   PROJECT_ISSUES_LIST,
-  CYCLE_ISSUES,
   USER_ISSUE,
   PROJECTS_LIST,
-  MODULE_ISSUES,
   SUB_ISSUES,
   PROJECT_ISSUES_LIST_WITH_PARAMS,
   CYCLE_ISSUES_WITH_PARAMS,
+  MODULE_ISSUES_WITH_PARAMS,
 } from "constants/fetch-keys";
 
 export interface IssuesModalProps {
@@ -101,27 +100,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
       .addIssueToCycle(workspaceSlug as string, activeProject ?? "", cycleId, {
         issues: [issueId],
       })
-      .then((res) => {
+      .then(() => {
         mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId, params));
-        if (isUpdatingSingleIssue) {
-          mutate<IIssue>(
-            PROJECT_ISSUES_DETAILS,
-            (prevData) => ({ ...(prevData as IIssue), sprints: cycleId }),
-            false
-          );
-        } else
-          mutate<IIssue[]>(
-            PROJECT_ISSUES_LIST_WITH_PARAMS(activeProject ?? "", params),
-            (prevData) =>
-              (prevData ?? []).map((i) => {
-                if (i.id === res.id) return { ...i, sprints: cycleId };
-                return i;
-              }),
-            false
-          );
-      })
-      .catch((err) => {
-        console.log(err);
       });
   };
 
@@ -132,11 +112,9 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
       .addIssuesToModule(workspaceSlug as string, activeProject ?? "", moduleId as string, {
         issues: [issueId],
       })
-      .then((res) => {
-        console.log(res);
-        mutate(MODULE_ISSUES(moduleId as string));
-      })
-      .catch((e) => console.log(e));
+      .then(() => {
+        mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+      });
   };
 
   const createIssue = async (payload: Partial<IIssue>) => {
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
index b184542b2..de5c5cfaa 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/cycles/[cycleId].tsx
@@ -20,6 +20,8 @@ import { CycleDetailsSidebar } from "components/cycles";
 import issuesService from "services/issues.service";
 import cycleServices from "services/cycles.service";
 import projectService from "services/project.service";
+// hooks
+import useToast from "hooks/use-toast";
 // ui
 import { CustomMenu } from "components/ui";
 import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
@@ -44,6 +46,8 @@ const SingleCycle: React.FC<UserAuth> = (props) => {
   const router = useRouter();
   const { workspaceSlug, projectId, cycleId } = router.query;
 
+  const { setToastAlert } = useToast();
+
   const { data: activeProject } = useSWR(
     workspaceSlug && projectId ? PROJECT_DETAILS(projectId as string) : null,
     workspaceSlug && projectId
@@ -93,12 +97,15 @@ const SingleCycle: React.FC<UserAuth> = (props) => {
 
     await issuesService
       .addIssueToCycle(workspaceSlug as string, projectId as string, cycleId as string, data)
-      .then((res) => {
-        console.log(res);
+      .then(() => {
         mutate(CYCLE_ISSUES(cycleId as string));
       })
-      .catch((e) => {
-        console.log(e);
+      .catch(() => {
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Selected issues could not be added to the cycle. Please try again.",
+        });
       });
   };
 
@@ -107,7 +114,7 @@ const SingleCycle: React.FC<UserAuth> = (props) => {
       <ExistingIssuesListModal
         isOpen={cycleIssuesListModal}
         handleClose={() => setCycleIssuesListModal(false)}
-        issues={issues?.filter((i) => !i.issue_cycle) ?? []}
+        issues={issues?.filter((i) => !i.cycle_id) ?? []}
         handleOnSubmit={handleAddIssuesToCycle}
       />
       <AppLayout
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
index dabf9ad29..061214c09 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/modules/[moduleId].tsx
@@ -17,6 +17,8 @@ import { requiredAdmin, requiredAuth } from "lib/auth";
 // services
 import modulesService from "services/modules.service";
 import issuesService from "services/issues.service";
+// hooks
+import useToast from "hooks/use-toast";
 // layouts
 import AppLayout from "layouts/app-layout";
 // contexts
@@ -47,6 +49,8 @@ const SingleModule: React.FC<UserAuth> = (props) => {
   const router = useRouter();
   const { workspaceSlug, projectId, moduleId } = router.query;
 
+  const { setToastAlert } = useToast();
+
   const { data: issues } = useSWR(
     workspaceSlug && projectId
       ? PROJECT_ISSUES_LIST(workspaceSlug as string, projectId as string)
@@ -96,7 +100,13 @@ const SingleModule: React.FC<UserAuth> = (props) => {
         console.log(res);
         mutate(MODULE_ISSUES(moduleId as string));
       })
-      .catch((e) => console.log(e));
+      .catch((e) =>
+        setToastAlert({
+          type: "error",
+          title: "Error!",
+          message: "Selected issues could not be added to the module. Please try again.",
+        })
+      );
   };
 
   const openIssuesListModal = () => {
@@ -108,7 +118,7 @@ const SingleModule: React.FC<UserAuth> = (props) => {
       <ExistingIssuesListModal
         isOpen={moduleIssuesListModal}
         handleClose={() => setModuleIssuesListModal(false)}
-        issues={issues?.filter((i) => !i.issue_module) ?? []}
+        issues={issues?.filter((i) => !i.module_id) ?? []}
         handleOnSubmit={handleAddIssuesToModule}
       />
       <AppLayout
diff --git a/apps/app/types/issues.d.ts b/apps/app/types/issues.d.ts
index 04c485b48..ca95269c1 100644
--- a/apps/app/types/issues.d.ts
+++ b/apps/app/types/issues.d.ts
@@ -81,6 +81,7 @@ export interface IIssue {
   created_at: Date;
   created_by: string;
   cycle: string | null;
+  cycle_id: string | null;
   cycle_detail: ICycle | null;
   description: any;
   description_html: any;
@@ -100,6 +101,7 @@ export interface IIssue {
   label_details: any[];
   links_list: IIssueLink[];
   module: string | null;
+  module_id: string | null;
   name: string;
   parent: string | null;
   parent_detail: IIssueParent | null;