diff --git a/website/src/components/Messages/MessageTableEntry.tsx b/website/src/components/Messages/MessageTableEntry.tsx
index 9626b95e..6d1ce41c 100644
--- a/website/src/components/Messages/MessageTableEntry.tsx
+++ b/website/src/components/Messages/MessageTableEntry.tsx
@@ -1,4 +1,5 @@
 import { Avatar, HStack, LinkBox, LinkOverlay, useColorModeValue } from "@chakra-ui/react";
+import Link from "next/link";
 import { boolean } from "boolean";
 import { FlaggableElement } from "src/components/FlaggableElement";
 
@@ -25,9 +26,11 @@ export function MessageTableEntry(props: MessageTableEntryProps) {
             src={`${boolean(item.is_assistant) ? "/images/logos/logo.png" : "/images/temp-avatars/av1.jpg"}`}
           />
 
-          <LinkBox bg={backgroundColor} fontFamily="Inter" className={`p-4 rounded-md whitespace-pre-wrap w-full`}>
-            <LinkOverlay href={`/messages/${item.id}`}>{item.text}</LinkOverlay>
-          </LinkBox>
+          <Link href={`/messages/${item.id}`}>
+            <LinkBox bg={backgroundColor} fontFamily="Inter" className={`p-4 rounded-md whitespace-pre-wrap w-full`}>
+              <LinkOverlay>{item.text}</LinkOverlay>
+            </LinkBox>
+          </Link>
         </HStack>
       </FlaggableElement>
     </div>