diff --git a/web/components/issues/modal.tsx b/web/components/issues/modal.tsx
index 350fbad0b..07b68d9fe 100644
--- a/web/components/issues/modal.tsx
+++ b/web/components/issues/modal.tsx
@@ -118,6 +118,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(
       };
 
     const onClose = () => {
+      setCustomAttributesList({});
+
       if (!showConfirmDiscard) handleClose();
       if (formDirtyState === null) return setActiveProject(null);
       const data = JSON.stringify(formDirtyState);
@@ -125,6 +127,8 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(
     };
 
     const onDiscardClose = () => {
+      setCustomAttributesList({});
+
       if (formDirtyState !== null) {
         setShowConfirmDiscard(true);
       } else {
diff --git a/web/layouts/app-layout/app-sidebar.tsx b/web/layouts/app-layout/app-sidebar.tsx
index 03ac72387..ae9f7aaae 100644
--- a/web/layouts/app-layout/app-sidebar.tsx
+++ b/web/layouts/app-layout/app-sidebar.tsx
@@ -21,9 +21,7 @@ export interface SidebarProps {
 }
 
 const Sidebar: React.FC<SidebarProps> = observer(({ toggleSidebar, setToggleSidebar }) => {
-  const store: any = useMobxStore();
-  // theme
-  const { collapsed: sidebarCollapse } = useTheme();
+  const store = useMobxStore();
 
   return (
     <div