diff --git a/apps/web/src/views/public/board/CardModal.tsx b/apps/web/src/views/public/board/CardModal.tsx
index b5cf1902..82584f33 100644
--- a/apps/web/src/views/public/board/CardModal.tsx
+++ b/apps/web/src/views/public/board/CardModal.tsx
@@ -67,22 +67,23 @@ export function CardModal({
             <div className="flex w-full items-center justify-between">
               <button
                 className="absolute right-[2rem] top-[2rem] rounded p-1 hover:bg-light-300 focus:outline-none dark:hover:bg-dark-300"
-                onClick={async (e) => {
+                onClick={(e) => {
                   e.preventDefault();
                   closeModal();
 
-                  setTimeout(async () => {
-                    try {
-                      await router.replace(
-                        `/${workspaceSlug}/${boardSlug}`,
-                        undefined,
-                        {
-                          shallow: true,
+                  setTimeout(() => {
+                    void router.replace(
+                      {
+                        pathname: router.pathname,
+                        query: {
+                          ...router.query,
+                          workspaceSlug,
+                          boardSlug: [boardSlug],
                         },
-                      );
-                    } catch (error) {
-                      console.error(error);
-                    }
+                      },
+                      undefined,
+                      { shallow: true },
+                    );
                   }, 400);
                 }}
               >
diff --git a/apps/web/src/views/public/board/index.tsx b/apps/web/src/views/public/board/index.tsx
index 1f3ea34c..96e89b12 100644
--- a/apps/web/src/views/public/board/index.tsx
+++ b/apps/web/src/views/public/board/index.tsx
@@ -76,7 +76,8 @@ export default function PublicBoardView() {
     );
   };
 
-  const splitPath = router.asPath.split("/");
+  const pathWithoutQuery = router.asPath.split("?")[0];
+  const splitPath = pathWithoutQuery.split("/");
   const cardPublicId = splitPath.length > 3 ? splitPath[3] : null;
 
   useEffect(() => {
@@ -172,27 +173,36 @@ export default function PublicBoardView() {
                       </span>
                     </div>
                     <div className="scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-w-[8px] z-10 h-full max-h-[calc(100vh-265px)] min-h-[2rem] overflow-y-auto pr-1 scrollbar dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-600">
-                      {list.cards.map((card) => (
-                        <Link
-                          key={card.publicId}
-                          href={`/${data.workspace.slug}/${data.slug}/${card.publicId}`}
-                          className={`mb-2 flex !cursor-pointer flex-col`}
-                          shallow={true}
-                          onClick={() => {
-                            openModal("CARD");
-                          }}
-                        >
-                          <Card
-                            title={card.title}
-                            labels={card.labels}
-                            checklists={card.checklists ?? []}
-                            members={[]}
-                            description={card.description}
-                            comments={card.comments ?? []}
-                            attachments={card.attachments}
-                          />
-                        </Link>
-                      ))}
+                      {list.cards.map((card) => {
+                        return (
+                          <Link
+                            key={card.publicId}
+                            href={{
+                              pathname: router.pathname,
+                              query: {
+                                ...router.query,
+                                workspaceSlug: data.workspace.slug,
+                                boardSlug: [data.slug, card.publicId],
+                              },
+                            }}
+                            className={`mb-2 flex !cursor-pointer flex-col`}
+                            shallow={true}
+                            onClick={() => {
+                              openModal("CARD");
+                            }}
+                          >
+                            <Card
+                              title={card.title}
+                              labels={card.labels}
+                              checklists={card.checklists ?? []}
+                              members={[]}
+                              description={card.description}
+                              comments={card.comments ?? []}
+                              attachments={card.attachments}
+                            />
+                          </Link>
+                        );
+                      })}
                     </div>
                   </div>
                 ))}