diff --git a/src/components/moderation/SubmissionItemsList.tsx b/src/components/moderation/SubmissionItemsList.tsx
index 796d267a..c4190724 100644
--- a/src/components/moderation/SubmissionItemsList.tsx
+++ b/src/components/moderation/SubmissionItemsList.tsx
@@ -70,7 +70,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
                   .select('*')
                   .eq('id', item.item_data_id)
                   .maybeSingle();
-                entityData = data;
+                entityData = data as any;
                 break;
               }
               case 'ride': {
@@ -79,7 +79,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
                   .select('*')
                   .eq('id', item.item_data_id)
                   .maybeSingle();
-                entityData = data;
+                entityData = data as any;
                 break;
               }
               case 'manufacturer':
@@ -91,7 +91,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
                   .select('*')
                   .eq('id', item.item_data_id)
                   .maybeSingle();
-                entityData = data;
+                entityData = data as any;
                 break;
               }
               case 'photo': {
@@ -100,7 +100,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
                   .select('*')
                   .eq('id', item.item_data_id)
                   .maybeSingle();
-                entityData = data;
+                entityData = data as any;
                 break;
               }
               default:
diff --git a/src/components/moderation/renderers/QueueItemHeader.tsx b/src/components/moderation/renderers/QueueItemHeader.tsx
index 51391efb..7af7e12c 100644
--- a/src/components/moderation/renderers/QueueItemHeader.tsx
+++ b/src/components/moderation/renderers/QueueItemHeader.tsx
@@ -102,7 +102,7 @@ export const QueueItemHeader = memo(({
               Claimed by You
             </Badge>
           )}
-          {item.submission_items && item.submission_items.length > 0 && (
+          {item.submission_items && item.submission_items.length > 0 && item.submission_items[0].item_data && (
             <ValidationSummary
               item={{
                 item_type: item.submission_items[0].item_type,