diff --git a/src/components/modals/ReplyModal.jsx b/src/components/modals/ReplyModal.jsx
index c15ce2fa..46c28adc 100755
--- a/src/components/modals/ReplyModal.jsx
+++ b/src/components/modals/ReplyModal.jsx
@@ -178,7 +178,7 @@ const ReplyModal = ({ isOpen, closeModal }) => {
       ...prevPublishCommentOptions,
       author: {
         displayName: nameRef.current.value || undefined,
-        address: account?.author.address,
+        ...(anonymousMode ? {} : {address: account?.author.address}),
       },
       content: commentRef.current.value || undefined,
       link: linkRef.current.value || undefined,
diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index 749d37d8..73847534 100755
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -446,7 +446,7 @@ const Board = () => {
       ...prevPublishCommentOptions,
       author: {
         displayName: nameRef.current.value || undefined,
-        address: account?.author.address,
+        ...(anonymousMode ? {} : {address: account?.author.address}),
       },
       title: subjectRef.current.value || undefined,
       content: commentRef.current.value || undefined,
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 79a21001..2dc9a08a 100755
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -906,7 +906,7 @@ const Catalog = () => {
       ...prevPublishCommentOptions,
       author: {
         displayName: nameRef.current.value || undefined,
-        address: account?.author.address,
+        ...(anonymousMode ? {} : {address: account?.author.address}),
       },
       title: subjectRef.current.value || undefined,
       content: commentRef.current.value || undefined,
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index a4a8bdc7..2a43c816 100755
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -387,7 +387,7 @@ const Thread = () => {
       ...prevPublishCommentOptions,
       author: {
         displayName: nameRef.current.value || undefined,
-        address: account?.author.address,
+        ...(anonymousMode ? {} : {address: account?.author.address}),
       },
       content: commentRef.current.value || undefined,
       link: linkRef.current.value || undefined,