diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index 271b0bf1..c4e6d202 100644
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -46,7 +46,7 @@ const Board = () => {
     setPendingComment,
     setPendingCommentIndex,
     setResolveCaptchaPromise,
-    selectedAddress, setSelectedAddress,
+    setSelectedAddress,
     setSelectedParentCid,
     setSelectedShortCid,
     selectedStyle,
@@ -67,6 +67,7 @@ const Board = () => {
   const threadMenuRefs = useRef({});
   const replyMenuRefs = useRef({});
 
+  const selectedAddress = subplebbitAddress || subplebbit.address;
   const { feed, hasMore, loadMore } = useFeed({subplebbitAddresses: [`${selectedAddress}`], sortType: 'new'});
   const subplebbit = useSubplebbit({subplebbitAddress: selectedAddress});
   const { subscribed, subscribe, unsubscribe } = useSubscribe({subplebbitAddress: selectedAddress});
@@ -92,11 +93,6 @@ const Board = () => {
   useSuccess(successMessage, [successMessage]);
 
 
-  useEffect(() => {
-    setSelectedAddress(subplebbitAddress);
-  }, [subplebbitAddress, setSelectedAddress]);
-
-
   useEffect(() => {
     if (subplebbit.roles !== undefined) { 
       const role = subplebbit.roles[account?.author.address]?.role;