diff --git a/website/src/components/FlaggableElement.tsx b/website/src/components/FlaggableElement.tsx
index 9606f425..a7157c4a 100644
--- a/website/src/components/FlaggableElement.tsx
+++ b/website/src/components/FlaggableElement.tsx
@@ -36,13 +36,14 @@ interface textFlagLabels {
 export const FlaggableElement = (props) => {
   const [isEditing, setIsEditing] = useBoolean();
   const flaggable_labels = props.flaggable_labels;
-  const TEXT_LABEL_FLAGS = flaggable_labels.valid_labels.map((valid_label) => {
-    return {
-      attributeName: valid_label.name,
-      labelText: valid_label.display_text,
-      additionalExplanation: valid_label.help_text,
-    };
-  });
+  const TEXT_LABEL_FLAGS =
+    flaggable_labels?.valid_labels?.map((valid_label) => {
+      return {
+        attributeName: valid_label.name,
+        labelText: valid_label.display_text,
+        additionalExplanation: valid_label.help_text,
+      };
+    }) || [];
   const { trigger } = useSWRMutation("/api/set_label", poster, {
     onSuccess: () => {
       setIsEditing.off();
diff --git a/website/src/components/Messages/MessageTable.tsx b/website/src/components/Messages/MessageTable.tsx
index bacd27f9..872b79f1 100644
--- a/website/src/components/Messages/MessageTable.tsx
+++ b/website/src/components/Messages/MessageTable.tsx
@@ -5,7 +5,7 @@ export function MessageTable({ messages, valid_labels }) {
   return (
     <Stack divider={<StackDivider />} spacing="4">
       {messages.map((item, idx) => (
-        <MessageTableEntry item={item} idx={idx} key={item.message_id} valid_labels={valid_labels} />
+        <MessageTableEntry item={item} idx={idx} key={item.message_id || item.id} valid_labels={valid_labels} />
       ))}
     </Stack>
   );