diff --git a/src/components/ReplyModal.jsx b/src/components/ReplyModal.jsx
index 0a53a9cd..4fbbb70d 100644
--- a/src/components/ReplyModal.jsx
+++ b/src/components/ReplyModal.jsx
@@ -83,7 +83,7 @@ const ReplyModal = ({ isOpen, closeModal }) => {
     if (index !== undefined) {
       setPendingCommentIndex(index);
     }
-  }, [index, location]);
+  }, [index, location, setPendingCommentIndex]);
 
   
   const resetFields = () => {
diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index 56d7e1ea..e2db73a4 100644
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -64,7 +64,6 @@ const Board = () => {
 
   const account = useAccount();
 
-
   const flattenedRepliesByThread = useMemo(() => {
     return selectedFeed.reduce((acc, thread) => {
       const replies = flattenCommentsPages(thread.replies);
@@ -207,7 +206,7 @@ const Board = () => {
       setPendingCommentIndex(index);
       navigate(`/profile/c/${index}`);
     }
-  }, [index]);
+  }, [index, navigate, setPendingCommentIndex]);
 
   
   const resetFields = () => {
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 7e295462..848891fe 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -133,7 +133,7 @@ const Catalog = () => {
       setPendingCommentIndex(index);
       navigate(`/profile/c/${index}`);
     }
-  }, [index]);
+  }, [index, navigate, setPendingCommentIndex]);
 
   
   const resetFields = () => {
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index a33297e7..93b5df88 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -75,7 +75,7 @@ const Thread = () => {
     parentCids: [
       selectedThread || 'n/a', ...flattenedReplies.map(reply => reply.cid)
     ]
-  }), [flattenedReplies]);
+  }), [flattenedReplies, selectedThread]);
 
 
   const { accountComments } = useAccountComments({filter});
@@ -100,7 +100,7 @@ const Thread = () => {
     if (selectedSubplebbit) {
       setSelectedTitle(selectedSubplebbit.title);
     }
-  }, [subplebbitAddress, setSelectedAddress, setSelectedTitle, defaultSubplebbits]);
+  }, [subplebbitAddress, setSelectedAddress, setSelectedTitle, defaultSubplebbits, setSelectedThread, threadCid]);
 
   // mobile navbar scroll effect
   useEffect(() => {
@@ -167,7 +167,7 @@ const Thread = () => {
     if (index !== undefined) {
       setPendingCommentIndex(index);
     }
-  }, [index]);
+  }, [index, setPendingCommentIndex]);
 
   
   const resetFields = () => {