diff --git a/web/components/dropdowns/types.d.ts b/web/components/dropdowns/types.d.ts
index f9a078382..b99369022 100644
--- a/web/components/dropdowns/types.d.ts
+++ b/web/components/dropdowns/types.d.ts
@@ -18,5 +18,6 @@ export type TDropdownProps = {
   placeholder?: string;
   placement?: Placement;
   tabIndex?: number;
+  // TODO: rename this prop to showTooltip
   tooltip?: boolean;
 };
diff --git a/web/store/issue/issue-details/issue.store.ts b/web/store/issue/issue-details/issue.store.ts
index bc34af0f6..284e5d201 100644
--- a/web/store/issue/issue-details/issue.store.ts
+++ b/web/store/issue/issue-details/issue.store.ts
@@ -90,6 +90,7 @@ export class IssueStore implements IIssueStore {
       this.rootIssueDetailStore.relation.fetchRelations(workspaceSlug, projectId, issueId);
 
       // fetching states
+      // TODO: check if this function is required
       this.rootIssueDetailStore.rootIssueStore.state.fetchProjectStates(workspaceSlug, projectId);
 
       return issue;
diff --git a/web/store/issue/issue.store.ts b/web/store/issue/issue.store.ts
index f31c8f2f6..8ee689daf 100644
--- a/web/store/issue/issue.store.ts
+++ b/web/store/issue/issue.store.ts
@@ -43,7 +43,7 @@ export class IssueStore implements IIssueStore {
     if (issues && issues.length <= 0) return;
     runInAction(() => {
       issues.forEach((issue) => {
-        set(this.issuesMap, issue.id, issue);
+        if (!this.issuesMap[issue.id]) set(this.issuesMap, issue.id, issue);
       });
     });
   };