diff --git a/website/src/components/Messages/MessageTableEntry.tsx b/website/src/components/Messages/MessageTableEntry.tsx
index 756d0b7c..7423aaea 100644
--- a/website/src/components/Messages/MessageTableEntry.tsx
+++ b/website/src/components/Messages/MessageTableEntry.tsx
@@ -16,7 +16,7 @@ export function MessageTableEntry(props: MessageTableEntryProps) {
 
   return (
     <div>
-      <FlaggableElement text={item.text} post_id={item.id} key={`flag_${item.id}`}>
+      <FlaggableElement text={item.text} message_id={item.message_id} post_id={item.id} key={`flag_${item.id}`}>
         <HStack>
           <Avatar
             size="sm"
diff --git a/website/src/pages/api/set_label.ts b/website/src/pages/api/set_label.ts
index 7e50fd44..7c8aebd5 100644
--- a/website/src/pages/api/set_label.ts
+++ b/website/src/pages/api/set_label.ts
@@ -6,7 +6,7 @@ import { withoutRole } from "src/lib/auth";
  */
 const handler = withoutRole("banned", async (req, res, token) => {
   // Parse out the local message_id, task ID and the interaction contents.
-  const { message_id, label_map, text } = await JSON.parse(req.body);
+  const { message_id, post_id, label_map, text } = await JSON.parse(req.body);
 
   const interactionRes = await fetch(`${process.env.FASTAPI_URL}/api/v1/text_labels`, {
     method: "POST",
@@ -16,7 +16,7 @@ const handler = withoutRole("banned", async (req, res, token) => {
     },
     body: JSON.stringify({
       type: "text_labels",
-      message_id: message_id,
+      message_id: message_id || post_id,
       labels: label_map,
       text: text,
       user: {
@@ -26,6 +26,10 @@ const handler = withoutRole("banned", async (req, res, token) => {
       },
     }),
   });
+  if (interactionRes.status !== 204) {
+    const r = await interactionRes.json();
+    console.error(JSON.stringify(r));
+  }
   res.status(interactionRes.status).end();
 });