diff --git a/api/__mocks__/exam-environment-exam.ts b/api/__mocks__/exam-environment-exam.ts
index 0c52edc715e..6ff3b7c20b3 100644
--- a/api/__mocks__/exam-environment-exam.ts
+++ b/api/__mocks__/exam-environment-exam.ts
@@ -255,6 +255,7 @@ export const generatedExam: ExamEnvironmentGeneratedExam = {
 export const examAttempt: ExamEnvironmentExamAttempt = {
   examId,
   generatedExamId: generatedExam.id,
+  examModerationId: null,
   id: oid(),
   questionSets: [
     {
diff --git a/api/prisma/exam-environment.prisma b/api/prisma/exam-environment.prisma
index adad76a56f9..48e3a0ca41b 100644
--- a/api/prisma/exam-environment.prisma
+++ b/api/prisma/exam-environment.prisma
@@ -118,26 +118,31 @@ type ExamEnvironmentTagConfig {
 
 /// An attempt at an exam in the Exam Environment App
 model ExamEnvironmentExamAttempt {
-  id              String @id @default(auto()) @map("_id") @db.ObjectId
+  id               String  @id @default(auto()) @map("_id") @db.ObjectId
   /// Foriegn key to user
-  userId          String @db.ObjectId
+  userId           String  @db.ObjectId
   /// Foreign key to exam
-  examId          String @db.ObjectId
+  examId           String  @db.ObjectId
   /// Foreign key to generated exam id
-  generatedExamId String @db.ObjectId
+  generatedExamId  String  @db.ObjectId
+  /// Un-enforced foreign key to moderation
+  examModerationId String? @db.ObjectId
 
   questionSets ExamEnvironmentQuestionSetAttempt[]
   /// Time exam was started
   startTime    DateTime
   /// Version of the record
   /// The default must be incremented by 1, if anything in the schema changes
-  version      Int                                 @default(3)
+  version      Int                                 @default(4)
 
   // Relations
-  user                          user                            @relation(fields: [userId], references: [id], onDelete: Cascade)
-  exam                          ExamEnvironmentExam             @relation(fields: [examId], references: [id], onDelete: Cascade)
-  generatedExam                 ExamEnvironmentGeneratedExam    @relation(fields: [generatedExamId], references: [id])
-  ExamEnvironmentExamModeration ExamEnvironmentExamModeration[]
+  user                          user                           @relation(fields: [userId], references: [id], onDelete: Cascade)
+  exam                          ExamEnvironmentExam            @relation(fields: [examId], references: [id], onDelete: Cascade)
+  generatedExam                 ExamEnvironmentGeneratedExam   @relation(fields: [generatedExamId], references: [id])
+  // Ideally, there could be a way to add a one-way optional relation here, but Prisma does not allow that:
+  // Error parsing attribute "@relation": The relation fields `examAttempt` on Model `ExamEnvironmentExamModeration` and `examModeration` on Model `ExamEnvironmentExamAttempt` both provide the `references` argument in the @relation attribute. You have to provide it only on one of the two fields.
+  // examModeration ExamEnvironmentExamModeration? @relation(fields: [examModerationId], references: [id])
+  examEnvironmentExamModeration ExamEnvironmentExamModeration?
 }
 
 type ExamEnvironmentQuestionSetAttempt {
diff --git a/api/src/exam-environment/routes/exam-environment.test.ts b/api/src/exam-environment/routes/exam-environment.test.ts
index 9902b4a1fd0..1b473135e60 100644
--- a/api/src/exam-environment/routes/exam-environment.test.ts
+++ b/api/src/exam-environment/routes/exam-environment.test.ts
@@ -590,6 +590,7 @@ describe('/exam-environment/', () => {
           userId: defaultUserId,
           examId: mock.examId,
           generatedExamId: generatedExam!.id,
+          examModerationId: null,
           questionSets: [],
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           startTime: expect.any(Date),
diff --git a/api/src/exam-environment/routes/exam-environment.ts b/api/src/exam-environment/routes/exam-environment.ts
index 41c610d8deb..323098eb4b5 100644
--- a/api/src/exam-environment/routes/exam-environment.ts
+++ b/api/src/exam-environment/routes/exam-environment.ts
@@ -458,6 +458,7 @@ async function postExamGeneratedExamHandler(
         userId: user.id,
         examId: exam.id,
         generatedExamId: generatedExam.id,
+        examModerationId: null,
         startTime: new Date(),
         questionSets: []
       }
diff --git a/api/src/exam-environment/utils/exam-environment.test.ts b/api/src/exam-environment/utils/exam-environment.test.ts
index 8b1f8871d40..c2fe078014d 100644
--- a/api/src/exam-environment/utils/exam-environment.test.ts
+++ b/api/src/exam-environment/utils/exam-environment.test.ts
@@ -518,6 +518,7 @@ describe('Exam Environment Schema', () => {
         data: {
           examId: oid(),
           generatedExamId: oid(),
+          examModerationId: null,
           questionSets: [
             {
               id: oid(),