diff --git a/web/src/components/MemoContent.tsx b/web/src/components/MemoContent.tsx
index 447b8897a..978fde0ed 100644
--- a/web/src/components/MemoContent.tsx
+++ b/web/src/components/MemoContent.tsx
@@ -3,8 +3,7 @@ import { useTranslation } from "react-i18next";
 import { marked } from "../labs/marked";
 import { highlightWithWord } from "../labs/highlighter";
 import Icon from "./Icon";
-import { SETTING_IS_FOLDING_ENABLED_KEY, IS_FOLDING_ENABLED_DEFAULT_VALUE } from "../helpers/consts";
-import useLocalStorage from "../hooks/useLocalStorage";
+import { useAppSelector } from "../store";
 import "../less/memo-content.less";
 
 export interface DisplayConfig {
@@ -37,7 +36,8 @@ const MemoContent: React.FC<Props> = (props: Props) => {
     return firstHorizontalRuleIndex !== -1 ? content.slice(0, firstHorizontalRuleIndex) : content;
   }, [content]);
   const { t } = useTranslation();
-  const [isFoldingEnabled] = useLocalStorage(SETTING_IS_FOLDING_ENABLED_KEY, IS_FOLDING_ENABLED_DEFAULT_VALUE);
+  const user = useAppSelector((state) => state.user.user);
+
   const [state, setState] = useState<State>({
     expandButtonStatus: -1,
   });
@@ -52,15 +52,20 @@ const MemoContent: React.FC<Props> = (props: Props) => {
       return;
     }
 
-    if (displayConfig.enableExpand && isFoldingEnabled) {
+    if (displayConfig.enableExpand && user && user.localSetting.isFoldingEnabled) {
       if (foldedContent.length !== content.length) {
         setState({
           ...state,
           expandButtonStatus: 0,
         });
       }
+    } else {
+      setState({
+        ...state,
+        expandButtonStatus: -1,
+      });
     }
-  }, []);
+  }, [user?.localSetting.isFoldingEnabled]);
 
   const handleMemoContentClick = async (e: React.MouseEvent) => {
     if (onMemoContentClick) {
diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx
index 091397187..d26b60e12 100644
--- a/web/src/components/Settings/PreferencesSection.tsx
+++ b/web/src/components/Settings/PreferencesSection.tsx
@@ -2,13 +2,7 @@ import { useTranslation } from "react-i18next";
 import Switch from "@mui/joy/Switch";
 import { globalService, userService } from "../../services";
 import { useAppSelector } from "../../store";
-import {
-  VISIBILITY_SELECTOR_ITEMS,
-  MEMO_DISPLAY_TS_OPTION_SELECTOR_ITEMS,
-  SETTING_IS_FOLDING_ENABLED_KEY,
-  IS_FOLDING_ENABLED_DEFAULT_VALUE,
-} from "../../helpers/consts";
-import useLocalStorage from "../../hooks/useLocalStorage";
+import { VISIBILITY_SELECTOR_ITEMS, MEMO_DISPLAY_TS_OPTION_SELECTOR_ITEMS } from "../../helpers/consts";
 import Selector from "../common/Selector";
 import "../../less/settings/preferences-section.less";
 
@@ -33,7 +27,7 @@ const localeSelectorItems = [
 
 const PreferencesSection = () => {
   const { t } = useTranslation();
-  const { setting } = useAppSelector((state) => state.user.user as User);
+  const { setting, localSetting } = useAppSelector((state) => state.user.user as User);
   const visibilitySelectorItems = VISIBILITY_SELECTOR_ITEMS.map((item) => {
     return {
       value: item.value,
@@ -48,8 +42,6 @@ const PreferencesSection = () => {
     };
   });
 
-  const [isFoldingEnabled, setIsFoldingEnabled] = useLocalStorage(SETTING_IS_FOLDING_ENABLED_KEY, IS_FOLDING_ENABLED_DEFAULT_VALUE);
-
   const handleLocaleChanged = async (value: string) => {
     await userService.upsertUserSetting("locale", value);
     globalService.setLocale(value as Locale);
@@ -64,7 +56,7 @@ const PreferencesSection = () => {
   };
 
   const handleIsFoldingEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setIsFoldingEnabled(event.target.checked);
+    userService.upsertLocalSetting("isFoldingEnabled", event.target.checked);
   };
 
   return (
@@ -95,7 +87,7 @@ const PreferencesSection = () => {
       </label>
       <label className="form-label selector">
         <span className="normal-text">{t("setting.preference-section.enable-folding-memo")}</span>
-        <Switch className="ml-2" checked={isFoldingEnabled} onChange={handleIsFoldingEnabledChanged} />
+        <Switch className="ml-2" checked={localSetting.isFoldingEnabled} onChange={handleIsFoldingEnabledChanged} />
       </label>
     </div>
   );
diff --git a/web/src/helpers/consts.ts b/web/src/helpers/consts.ts
index 3f3f383a7..f3bcbe1de 100644
--- a/web/src/helpers/consts.ts
+++ b/web/src/helpers/consts.ts
@@ -18,9 +18,6 @@ export const MEMO_DISPLAY_TS_OPTION_SELECTOR_ITEMS = [
   { text: "created_ts", value: "updated_ts" },
 ];
 
-export const IS_FOLDING_ENABLED_DEFAULT_VALUE = true;
-export const SETTING_IS_FOLDING_ENABLED_KEY = "setting_IS_FOLDING_ENABLED";
-
 export const TAB_SPACE_WIDTH = 2;
 
 export const APPERANCE_OPTIONS = ["auto", "light", "dark"] as const;
diff --git a/web/src/helpers/storage.ts b/web/src/helpers/storage.ts
index 5be389964..1b3e584fa 100644
--- a/web/src/helpers/storage.ts
+++ b/web/src/helpers/storage.ts
@@ -10,6 +10,8 @@ interface StorageData {
   editingMemoVisibilityCache: Visibility;
   // locale
   locale: Locale;
+  // local setting
+  localSetting: LocalSetting;
   // skipped version
   skippedVersion: string;
 }
diff --git a/web/src/services/userService.ts b/web/src/services/userService.ts
index 2bf1b97cb..79d8d9c63 100644
--- a/web/src/services/userService.ts
+++ b/web/src/services/userService.ts
@@ -1,5 +1,6 @@
 import { globalService, locationService } from ".";
 import * as api from "../helpers/api";
+import * as storage from "../helpers/storage";
 import { UNKNOWN_ID } from "../helpers/consts";
 import store from "../store";
 import { setLocale } from "../store/modules/global";
@@ -11,10 +12,19 @@ const defaultSetting: Setting = {
   memoDisplayTsOption: "created_ts",
 };
 
+const defaultLocalSetting: LocalSetting = {
+  isFoldingEnabled: true,
+};
+
 export const convertResponseModelUser = (user: User): User => {
   const setting: Setting = {
     ...defaultSetting,
   };
+  const { localSetting: storageLocalSetting } = storage.get(["localSetting"]);
+  const localSetting: LocalSetting = {
+    ...defaultLocalSetting,
+    ...storageLocalSetting,
+  };
 
   if (user.userSettingList) {
     for (const userSetting of user.userSettingList) {
@@ -25,6 +35,7 @@ export const convertResponseModelUser = (user: User): User => {
   return {
     ...user,
     setting,
+    localSetting,
     createdTs: user.createdTs * 1000,
     updatedTs: user.updatedTs * 1000,
   };
@@ -111,6 +122,11 @@ const userService = {
     await userService.doSignIn();
   },
 
+  upsertLocalSetting: async (key: keyof LocalSetting, value: any) => {
+    storage.set({ localSetting: { [key]: value } });
+    store.dispatch(patchUser({ localSetting: { [key]: value } }));
+  },
+
   patchUser: async (userPatch: UserPatch): Promise<void> => {
     const { data } = (await api.patchUser(userPatch)).data;
     if (userPatch.id === store.getState().user.user?.id) {
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index fb16e83b6..49d49b9f6 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -4,6 +4,10 @@ interface Setting {
   memoDisplayTsOption: "created_ts" | "updated_ts";
 }
 
+interface LocalSetting {
+  isFoldingEnabled: boolean;
+}
+
 interface UserLocaleSetting {
   key: "locale";
   value: Locale;
diff --git a/web/src/types/modules/user.d.ts b/web/src/types/modules/user.d.ts
index 3132cf6e9..7adee7870 100644
--- a/web/src/types/modules/user.d.ts
+++ b/web/src/types/modules/user.d.ts
@@ -16,6 +16,7 @@ interface User {
   userSettingList: UserSetting[];
 
   setting: Setting;
+  localSetting: LocalSetting;
 }
 
 interface UserCreate {