diff --git a/src/components/moderation/EntityEditPreview.tsx b/src/components/moderation/EntityEditPreview.tsx
index e4f38fdc..73c8a76b 100644
--- a/src/components/moderation/EntityEditPreview.tsx
+++ b/src/components/moderation/EntityEditPreview.tsx
@@ -90,9 +90,9 @@ export const EntityEditPreview = ({ submissionId, entityType, entityName }: Enti
         .from('submission_items')
         .select(`
           *,
-          park_submission:park_submissions!park_submission_id(*),
-          ride_submission:ride_submissions!ride_submission_id(*),
-          photo_submission:photo_submissions!photo_submission_id(
+          park_submission:park_submissions!submission_items_park_submission_id_fkey(*),
+          ride_submission:ride_submissions!submission_items_ride_submission_id_fkey(*),
+          photo_submission:photo_submissions!submission_items_photo_submission_id_fkey(
             *,
             photo_items:photo_submission_items(*)
           )
diff --git a/src/lib/submissionItemsService.ts b/src/lib/submissionItemsService.ts
index dedcabe5..5e5917e5 100644
--- a/src/lib/submissionItemsService.ts
+++ b/src/lib/submissionItemsService.ts
@@ -59,12 +59,12 @@ export async function fetchSubmissionItems(submissionId: string): Promise<Submis
     .from('submission_items')
     .select(`
       *,
-      park_submission:park_submissions!park_submission_id(*),
-      ride_submission:ride_submissions!ride_submission_id(*),
-      company_submission:company_submissions!company_submission_id(*),
-      ride_model_submission:ride_model_submissions!ride_model_submission_id(*),
-      timeline_event_submission:timeline_event_submissions!timeline_event_submission_id(*),
-      photo_submission:photo_submissions!photo_submission_id(
+      park_submission:park_submissions!submission_items_park_submission_id_fkey(*),
+      ride_submission:ride_submissions!submission_items_ride_submission_id_fkey(*),
+      company_submission:company_submissions!submission_items_company_submission_id_fkey(*),
+      ride_model_submission:ride_model_submissions!submission_items_ride_model_submission_id_fkey(*),
+      timeline_event_submission:timeline_event_submissions!submission_items_timeline_event_submission_id_fkey(*),
+      photo_submission:photo_submissions!submission_items_photo_submission_id_fkey(
         *,
         photo_items:photo_submission_items(*)
       )
diff --git a/src/lib/systemActivityService.ts b/src/lib/systemActivityService.ts
index 8bfda013..d90d5a5e 100644
--- a/src/lib/systemActivityService.ts
+++ b/src/lib/systemActivityService.ts
@@ -392,7 +392,7 @@ export async function fetchSystemActivities(
       .select(`
         submission_id,
         item_type,
-        photo_submission:photo_submissions!photo_submission_id(
+        photo_submission:photo_submissions!submission_items_photo_submission_id_fkey(
           *,
           photo_items:photo_submission_items(*)
         )