diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index bb16575f..83cd2cdc 100755
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -461,6 +461,10 @@ const Board = () => {
   const handleSubmit = async (event) => {
     event.preventDefault();
 
+    if (anonymousMode) {
+      setSelectedThreadCid(index);
+    }
+
     setPublishCommentOptions((prevPublishCommentOptions) => ({
       ...prevPublishCommentOptions,
       author: {
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 13904c5d..b15309d6 100755
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -1163,6 +1163,10 @@ const Catalog = () => {
   const selectedThreadCidRef = useRef(null);
   const virtuosoRef = useRef();
 
+  const setSelectedThreadCid = (cid) => {
+    selectedThreadCidRef.current = cid;
+  };
+
   const navigate = useNavigate();
 
   const [, setNewErrorMessage] = useError();
@@ -1333,6 +1337,10 @@ const Catalog = () => {
   const handleSubmit = async (event) => {
     event.preventDefault();
 
+    if (anonymousMode) {
+      setSelectedThreadCid(index);
+    }
+
     setPublishCommentOptions((prevPublishCommentOptions) => ({
       ...prevPublishCommentOptions,
       author: {