diff --git a/src/app/components/ChannelCompose.svelte b/src/app/components/ChannelCompose.svelte
index bea9d230..844069b5 100644
--- a/src/app/components/ChannelCompose.svelte
+++ b/src/app/components/ChannelCompose.svelte
@@ -21,7 +21,7 @@
 
     onSubmit({
       content: $editor!.getText({blockSeparator: "\n"}).trim(),
-      tags: $editor!.storage.welshman.getEditorTags(),
+      tags: $editor!.storage.nostr.getEditorTags(),
     })
 
     $editor!.chain().clearContent().run()
diff --git a/src/app/components/EventCreate.svelte b/src/app/components/EventCreate.svelte
index eea9b646..b076693e 100644
--- a/src/app/components/EventCreate.svelte
+++ b/src/app/components/EventCreate.svelte
@@ -45,7 +45,7 @@
         ["location", location],
         ["start", dateToSeconds(start).toString()],
         ["end", dateToSeconds(end).toString()],
-        ...$editor.storage.welshman.getEditorTags(),
+        ...$editor.storage.nostr.getEditorTags(),
         PROTECTED,
       ],
     })
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index 528d5f6f..c1b47c49 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -39,7 +39,7 @@
     }
 
     const tags = [
-      ...$editor.storage.welshman.getEditorTags(),
+      ...$editor.storage.nostr.getEditorTags(),
       tagRoom(GENERAL, url),
       ["title", title],
       PROTECTED,
diff --git a/src/app/components/ThreadReply.svelte b/src/app/components/ThreadReply.svelte
index 8c73ca2f..41b990ec 100644
--- a/src/app/components/ThreadReply.svelte
+++ b/src/app/components/ThreadReply.svelte
@@ -22,7 +22,7 @@
     if ($uploading) return
 
     const content = $editor.getText({blockSeparator: "\n"}).trim()
-    const tags = [...$editor.storage.welshman.getEditorTags(), tagRoom(GENERAL, url), PROTECTED]
+    const tags = [...$editor.storage.nostr.getEditorTags(), tagRoom(GENERAL, url), PROTECTED]
 
     if (!content) {
       return pushToast({