diff --git a/src/app/commands.ts b/src/app/commands.ts
index d83705af..ed061687 100644
--- a/src/app/commands.ts
+++ b/src/app/commands.ts
@@ -45,7 +45,7 @@ import {
   nip44EncryptToSelf,
   loadRelay,
 } from "@welshman/app"
-import {tagRoom, userMembership, MEMBERSHIPS, INDEXER_RELAYS, loadMembership} from "@app/state"
+import {tagRoom, userMembership, MEMBERSHIPS, INDEXER_RELAYS, loadMembership, loadSettings} from "@app/state"
 
 // Utils
 
@@ -86,6 +86,7 @@ export const loadUserData = (
   const promise = Promise.all([
     loadInboxRelaySelections(pubkey, request),
     loadMembership(pubkey, request),
+    loadSettings(pubkey, request),
     loadProfile(pubkey, request),
     loadFollows(pubkey, request),
     loadMutes(pubkey, request),
diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index 15904b00..9386d994 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -28,7 +28,7 @@
   import ContentQuote from "@app/components/ContentQuote.svelte"
   import ContentTopic from "@app/components/ContentTopic.svelte"
   import ContentMention from "@app/components/ContentMention.svelte"
-  import {entityLink} from "@app/state"
+  import {entityLink, userSettings} from "@app/state"
 
   export let event
   export let minLength = 500
@@ -69,7 +69,9 @@
     warning = null
   }
 
-  let warning = event.tags.find(nthEq(0, "content-warning"))?.[1]
+  let warning =
+    $userSettings?.values.hide_sensitive &&
+    event.tags.find(nthEq(0, "content-warning"))?.[1]
 
   $: shortContent = showEntire
     ? fullContent
diff --git a/src/app/state.ts b/src/app/state.ts
index 5447d0b0..bfa219e5 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -15,11 +15,13 @@ import {
   pushToMapKey,
   nthEq,
   shuffle,
+  parseJson,
 } from "@welshman/lib"
 import {
   getIdFilters,
   WRAP,
   RELAYS,
+  APP_DATA,
   REACTION,
   ZAP_RESPONSE,
   DIRECT_MESSAGE,
@@ -56,6 +58,7 @@ import {
   pull,
   createSearch,
   userFollows,
+  ensurePlaintext,
 } from "@welshman/app"
 import type {AppSyncOpts} from "@welshman/app"
 import type {SubscribeRequestWithHandlers} from "@welshman/net"
@@ -240,6 +243,42 @@ export const deriveEventsForUrl = (url: string, kinds: number[]) =>
     ),
   )
 
+// Settings
+
+export const SETTINGS =  "nostr-engine/User/settings/v1"
+
+export type Settings = {
+  event: TrustedEvent,
+  values: {
+    hide_sensitive: boolean
+  },
+}
+
+export const defaultSettings = {
+  hide_sensitive: true,
+}
+
+export const settings = deriveEventsMapped<Settings>(repository, {
+  filters: [{kinds: [APP_DATA], '#d': [SETTINGS]}],
+  itemToEvent: item => item.event,
+  eventToItem: async (event: TrustedEvent) =>
+    ({event, values: {...defaultSettings, ...parseJson(await ensurePlaintext(event))}})
+})
+
+export const {
+  indexStore: settingsByPubkey,
+  deriveItem: deriveSettings,
+  loadItem: loadSettings,
+} = collection({
+  name: "settings",
+  store: settings,
+  getKey: settings => settings.event.pubkey,
+  load: (pubkey: string, request: Partial<SubscribeRequestWithHandlers> = {}) =>
+    load({...request, filters: [{kinds: [APP_DATA], '#d': [SETTINGS], authors: [pubkey]}]}),
+})
+
+
+
 // Membership
 
 export const getMembershipUrls = (list?: List) => sort(getRelayTagValues(getListTags(list)))
@@ -418,6 +457,16 @@ export const roomsByUrl = derived(channels, $channels => {
 
 // User stuff
 
+export const userSettings = withGetter(
+  derived([pubkey, settingsByPubkey], ([$pubkey, $settingsByPubkey]) => {
+    if (!$pubkey) return undefined
+
+    loadSettings($pubkey)
+
+    return $settingsByPubkey.get($pubkey)
+  }),
+)
+
 export const userMembership = withGetter(
   derived([pubkey, membershipByPubkey], ([$pubkey, $membershipByPubkey]) => {
     if (!$pubkey) return undefined
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index d2389bb5..72546e58 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -1,20 +1,27 @@
 <script lang="ts">
   import {ctx} from "@welshman/lib"
-  import {getListTags, createEvent, getPubkeyTagValues, MUTES} from "@welshman/util"
-  import {userMutes, tagPubkey, publishThunk} from "@welshman/app"
+  import {getListTags, createEvent, getPubkeyTagValues, MUTES, APP_DATA} from "@welshman/util"
+  import {pubkey, signer, userMutes, tagPubkey, publishThunk} from "@welshman/app"
   import Field from "@lib/components/Field.svelte"
   import FieldInline from "@lib/components/FieldInline.svelte"
   import Button from "@lib/components/Button.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
   import {pushToast} from "@app/toast"
-
-  let mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
+  import {SETTINGS, userSettings} from "@app/state"
 
   const reset = () => {
     mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
   }
 
   const onSubmit = async () => {
+    publishThunk({
+      event: createEvent(APP_DATA, {
+        content: await $signer!.nip04.encrypt($pubkey!, JSON.stringify(settings)),
+        tags: [["d", SETTINGS]]
+      }),
+      relays: ctx.app.router.WriteRelays().getUrls(),
+    })
+
     publishThunk({
       event: createEvent(MUTES, {tags: mutedPubkeys.map(tagPubkey)}),
       relays: ctx.app.router.WriteRelays().getUrls(),
@@ -22,6 +29,9 @@
 
     pushToast({message: "Your settings have been saved!"})
   }
+
+  let settings = {...$userSettings?.values}
+  let mutedPubkeys = getPubkeyTagValues(getListTags($userMutes))
 </script>
 
 <form class="content column gap-4" on:submit|preventDefault={onSubmit}>
@@ -34,7 +44,7 @@
     </Field>
     <FieldInline>
       <p slot="label">Hide sensitive content?</p>
-      <input slot="input" type="checkbox" class="toggle toggle-primary" checked="checked" />
+      <input slot="input" type="checkbox" class="toggle toggle-primary" bind:checked={settings.hide_sensitive} />
       <p slot="info">If content is marked by the author as sensitive, flotilla will hide it by default.</p>
     </FieldInline>
     <div class="mt-4 flex flex-row items-center justify-between gap-4">