diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
index e3723a619..698b83a9b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
@@ -57,7 +57,8 @@ function initHearingRequest(): HearingModel {
             pin: 'pin',
             username: 'test@existing.com',
             contactEmail: 'test@existing.com',
-            interpretationLanguage: undefined
+            interpretationLanguage: undefined,
+            externalReferenceId: 'ex1'
         }
     ];
     return newHearing;
@@ -212,7 +213,14 @@ describe('EndpointsComponent', () => {
             featureServiceSpy.getFlag.withArgs(FeatureFlags.multiDayBookingEnhancements).and.returnValue(of(true));
             component.ngOnInit();
             component.videoEndpoints = [
-                { id: '1', displayName: 'Test', defenceAdvocate: null, interpretationLanguage: undefined, screening: undefined }
+                {
+                    id: '1',
+                    displayName: 'Test',
+                    defenceAdvocate: null,
+                    interpretationLanguage: undefined,
+                    screening: undefined,
+                    externalReferenceId: '1'
+                }
             ];
             component.saveEndpoints();
             expect(routerSpy.navigate).toHaveBeenCalledWith(['/other-information']);
@@ -232,7 +240,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointAdded(endpoint);
             expect(component.videoEndpoints).toContain(endpoint);
@@ -244,7 +253,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.videoEndpoints = [endpoint];
             component.onEndpointAdded(endpoint);
@@ -255,8 +265,22 @@ describe('EndpointsComponent', () => {
     describe('onEndpointUpdated', () => {
         beforeEach(() => {
             component.videoEndpoints = [
-                { id: '1', displayName: 'Test', defenceAdvocate: null, interpretationLanguage: undefined, screening: undefined },
-                { id: '2', displayName: 'Test2', defenceAdvocate: null, interpretationLanguage: undefined, screening: undefined }
+                {
+                    id: '1',
+                    displayName: 'Test',
+                    defenceAdvocate: null,
+                    interpretationLanguage: undefined,
+                    screening: undefined,
+                    externalReferenceId: '1'
+                },
+                {
+                    id: '2',
+                    displayName: 'Test2',
+                    defenceAdvocate: null,
+                    interpretationLanguage: undefined,
+                    screening: undefined,
+                    externalReferenceId: '1'
+                }
             ];
         });
 
@@ -266,7 +290,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.videoEndpoints = [endpoint];
             const updatedEndpoint = {
@@ -274,7 +299,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Updated',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointUpdated({ original: endpoint, updated: updatedEndpoint });
             expect(component.videoEndpoints).toContain(updatedEndpoint);
@@ -286,14 +312,16 @@ describe('EndpointsComponent', () => {
                 displayName: 'DoesNotExist',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             const updatedEndpoint = {
                 id: '1',
                 displayName: 'Updated',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointUpdated({ original: endpoint, updated: updatedEndpoint });
             expect(component.videoEndpoints).not.toContain(endpoint);
@@ -303,8 +331,22 @@ describe('EndpointsComponent', () => {
     describe('onEndpointSelectedForDeletion', () => {
         beforeEach(() => {
             component.videoEndpoints = [
-                { id: '1', displayName: 'Test', defenceAdvocate: null, interpretationLanguage: undefined, screening: undefined },
-                { id: '2', displayName: 'Test2', defenceAdvocate: null, interpretationLanguage: undefined, screening: undefined }
+                {
+                    id: '1',
+                    displayName: 'Test',
+                    defenceAdvocate: null,
+                    interpretationLanguage: undefined,
+                    screening: undefined,
+                    externalReferenceId: '1'
+                },
+                {
+                    id: '2',
+                    displayName: 'Test2',
+                    defenceAdvocate: null,
+                    interpretationLanguage: undefined,
+                    screening: undefined,
+                    externalReferenceId: '1'
+                }
             ];
         });
 
@@ -314,7 +356,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointSelectedForDeletion(endpoint);
             expect(component.videoEndpoints).not.toContain(endpoint);
@@ -326,7 +369,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test3',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointSelectedForDeletion(endpoint);
             expect(component.videoEndpoints.length).toBe(2);
@@ -340,7 +384,8 @@ describe('EndpointsComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: '1'
             };
             component.onEndpointSelectedForEdit(endpoint);
             expect(component.videoEndpointToEdit).toBe(endpoint);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
index dce9b8c7b..ceac8a7f6 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
@@ -95,7 +95,7 @@ export class EndpointsComponent extends BookingBaseComponent implements OnInit,
 
         const newEndpointsArray: EndpointModel[] = [];
         for (const vapDto of this.videoEndpoints) {
-            const endpointModel = new EndpointModel();
+            const endpointModel = new EndpointModel(vapDto.externalReferenceId);
             endpointModel.id = vapDto.id;
             endpointModel.displayName = vapDto.displayName;
             endpointModel.defenceAdvocate = vapDto.defenceAdvocate?.email;
@@ -197,7 +197,8 @@ export class EndpointsComponent extends BookingBaseComponent implements OnInit,
                       }
                     : null,
                 interpretationLanguage: e.interpretationLanguage,
-                screening: e.screening
+                screening: e.screening,
+                externalReferenceId: e.externalReferenceId
             };
         });
     }
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/models/video-access-point.model.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/models/video-access-point.model.ts
index 1967e11da..153a9c86e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/models/video-access-point.model.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/models/video-access-point.model.ts
@@ -7,6 +7,7 @@ export interface VideoAccessPointDto {
     defenceAdvocate?: EndpointLink;
     interpretationLanguage: InterpreterSelectedDto; // This should not be optional once the backend is implemented
     screening: ScreeningDto;
+    externalReferenceId: string;
 }
 
 export interface EndpointLink {
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
index 3e41f2608..8867dfe81 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, fakeAsync, flush } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
 import { VideoEndpointFormComponent } from './video-endpoint-form.component';
 import { VideoAccessPointDto } from '../models/video-access-point.model';
@@ -83,7 +83,8 @@ describe('VideoEndpointFormComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: undefined
             };
             component.form.setValue({
                 displayName: dto.displayName,
@@ -110,14 +111,16 @@ describe('VideoEndpointFormComponent', () => {
                 displayName: 'Original',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: undefined
             };
             const updatedDto: VideoAccessPointDto = {
                 id: '1',
                 displayName: 'Updated',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: undefined
             };
             component.existingVideoEndpoint = originalDto;
             component.form.setValue({
@@ -134,11 +137,11 @@ describe('VideoEndpointFormComponent', () => {
 
             const rep = component.availableRepresentatives[0];
             // update the input field with the email of the first participant via the debug fixture element
-            const displayNameInput = fixture.nativeElement.querySelector('[id="displayName"') as HTMLInputElement;
+            const displayNameInput = fixture.nativeElement.querySelector('[id="displayName"]') as HTMLInputElement;
             displayNameInput.value = 'Test Endpoint';
             displayNameInput.dispatchEvent(new Event('input'));
 
-            const linkedRepresentativeInput = fixture.nativeElement.querySelector('[id="representative"') as HTMLSelectElement;
+            const linkedRepresentativeInput = fixture.nativeElement.querySelector('[id="representative"]') as HTMLSelectElement;
             linkedRepresentativeInput.value = rep.email;
             linkedRepresentativeInput.dispatchEvent(new Event('change'));
 
@@ -150,7 +153,8 @@ describe('VideoEndpointFormComponent', () => {
                     displayName: rep.display_name
                 },
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: undefined
             });
         });
 
@@ -171,7 +175,8 @@ describe('VideoEndpointFormComponent', () => {
                     displayName: 'Test',
                     defenceAdvocate: null,
                     interpretationLanguage: undefined,
-                    screening: undefined
+                    screening: undefined,
+                    externalReferenceId: undefined
                 }
             ];
             component.videoEndpoint = {
@@ -179,7 +184,8 @@ describe('VideoEndpointFormComponent', () => {
                 displayName: 'Test',
                 defenceAdvocate: null,
                 interpretationLanguage: undefined,
-                screening: undefined
+                screening: undefined,
+                externalReferenceId: undefined
             };
             component.form.setValue({
                 displayName: 'Test',
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
index 1560e1c2e..f9971b03b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
@@ -94,7 +94,8 @@ export class VideoEndpointFormComponent {
             displayName: this.form.value.displayName,
             defenceAdvocate,
             interpretationLanguage: this.interpreterSelection,
-            screening: this.videoEndpoint?.screening
+            screening: this.videoEndpoint?.screening,
+            externalReferenceId: this.videoEndpoint?.externalReferenceId
         };
         if (this.editMode) {
             this.endpointUpdated.emit({ original: this.videoEndpoint, updated: dto });
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-item/video-endpoint-item.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-item/video-endpoint-item.component.spec.ts
index 08453b46e..10ea65ca2 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-item/video-endpoint-item.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-item/video-endpoint-item.component.spec.ts
@@ -26,7 +26,8 @@ describe('VideoEndpointItemComponent', () => {
             displayName: 'Test',
             defenceAdvocate: null,
             interpretationLanguage: undefined,
-            screening: undefined
+            screening: undefined,
+            externalReferenceId: undefined
         };
         component.videoEndpoint = dto;
         component.edit();
@@ -39,7 +40,8 @@ describe('VideoEndpointItemComponent', () => {
             displayName: 'Test',
             defenceAdvocate: null,
             interpretationLanguage: undefined,
-            screening: undefined
+            screening: undefined,
+            externalReferenceId: undefined
         };
         component.videoEndpoint = dto;
         component.delete();
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-list/video-endpoint-list.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-list/video-endpoint-list.component.spec.ts
index 0398f5816..a06959c4f 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-list/video-endpoint-list.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-list/video-endpoint-list.component.spec.ts
@@ -26,7 +26,8 @@ describe('VideoEndpointListComponent', () => {
             displayName: 'Test',
             defenceAdvocate: null,
             interpretationLanguage: undefined,
-            screening: undefined
+            screening: undefined,
+            externalReferenceId: undefined
         };
         component.editEndpoint.emit(dto);
         expect(component.editEndpoint.emit).toHaveBeenCalledWith(dto);
@@ -38,7 +39,8 @@ describe('VideoEndpointListComponent', () => {
             displayName: 'Test',
             defenceAdvocate: null,
             interpretationLanguage: undefined,
-            screening: undefined
+            screening: undefined,
+            externalReferenceId: undefined
         };
         component.deleteEndpoint.emit(dto);
         expect(component.deleteEndpoint.emit).toHaveBeenCalledWith(dto);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.html
index 0e9c635a4..8b7365216 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.html
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.html
@@ -63,7 +63,15 @@
     </div>
   </div>
 </ng-container>
-
+<div *ngIf="newParticipantRemovedFromOptions">
+  <div class="govuk-warning-text">
+    <span aria-hidden="true" class="govuk-warning-text__icon">!</span>
+    <strong class="govuk-warning-text__text">
+      <span class="govuk-warning-text__assistive">Warning</span>
+      New participants and endpoints cannot be included in screening options, without being saved first.
+    </strong>
+  </div>
+</div>
 <button
   *ngIf="form.value.displayName"
   type="submit"
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
index d8fa8ceff..9ae9db83e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
@@ -25,16 +25,19 @@ describe('ScreeningFormComponent', () => {
         participant2.email = 'email2';
         participant2.display_name = 'Participant2';
 
-        const endpoint1 = new EndpointModel();
+        const endpoint1 = new EndpointModel(null);
         endpoint1.id = '3';
         endpoint1.displayName = 'Endpoint 1';
+        endpoint1.sip = 'sip1';
 
-        const endpoint2 = new EndpointModel();
+        const endpoint2 = new EndpointModel(null);
         endpoint2.id = '4';
         endpoint2.displayName = 'Endpoint 2';
+        endpoint2.sip = 'sip2';
 
         hearing.participants = [participant1, participant2];
         hearing.endpoints = [endpoint1, endpoint2];
+        hearing.hearing_id = null; //new hearing
 
         loggerSpy = jasmine.createSpyObj('Logger', ['debug']);
         await TestBed.configureTestingModule({
@@ -47,6 +50,8 @@ describe('ScreeningFormComponent', () => {
         component = fixture.componentInstance;
         component.hearing = hearing;
         fixture.detectChanges();
+        component.newParticipantRemovedFromOptions = false;
+        component.isEditMode = false;
     });
 
     it('init component from input on create', () => {
@@ -113,4 +118,34 @@ describe('ScreeningFormComponent', () => {
             expect(component.displayProtectFromList).toBeFalse();
         });
     });
+
+    describe('filtering selectable participants for screening', () => {
+        it('should exclude newly added participants from screening options', () => {
+            // Arrange
+            hearing.hearing_id = '1'; // isEditMode = true
+            const newlyAddedParticipant = hearing.participants[0];
+            const newlyAddedEndpoint = hearing.endpoints[0];
+            newlyAddedParticipant.id = undefined;
+            newlyAddedEndpoint.id = undefined;
+
+            // Act
+            component.hearing = hearing;
+
+            // Assert
+            expect(component.allParticipants.filter(p => p.displayName === newlyAddedParticipant.display_name)).toEqual([]);
+            expect(component.allParticipants.filter(p => p.displayName === newlyAddedEndpoint.displayName)).toEqual([]);
+            expect(component.allParticipants.length).toBe(2);
+            expect(component.newParticipantRemovedFromOptions).toBeTrue();
+        });
+
+        it('should include existing participant in screening options', () => {
+            // Arrange
+            hearing.hearing_id = '1'; // isEditMode = true
+            // Act
+            component.hearing = hearing;
+            // Assert
+            expect(component.allParticipants.length).toBe(4);
+            expect(component.newParticipantRemovedFromOptions).toBeFalse();
+        });
+    });
 });
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
index 0db355c3f..6fe0159cc 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
@@ -2,14 +2,29 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angu
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { Subject, takeUntil } from 'rxjs';
 import { HearingModel } from 'src/app/common/model/hearing.model';
-import { Logger } from 'src/app/services/logger';
-import { ProtectFrom, SelectedScreeningDto, ScreeningType } from './screening.model';
+import { ProtectFrom, ScreeningType, SelectedScreeningDto } from './screening.model';
 
 @Component({
     selector: 'app-screening-form',
     templateUrl: './screening-form.component.html'
 })
 export class ScreeningFormComponent {
+    isEditMode = false;
+    newParticipantRemovedFromOptions = false;
+
+    constructor(private formBuilder: FormBuilder, private cdRef: ChangeDetectorRef) {}
+
+    @Output() screeningSaved = new EventEmitter<SelectedScreeningDto>();
+
+    displayMeasureType = false;
+    displayProtectFromList = false;
+    allParticipants: GenericParticipantsModel[];
+    availableProtectParticipantFromList: GenericParticipantsModel[] = [];
+    selectedProtectParticipantFromList: GenericParticipantsModel[] = [];
+
+    destroyed$ = new Subject<void>();
+    form: FormGroup<ScreeningSelectParticipantForm>;
+
     @Input() set hearing(hearing: HearingModel) {
         const mappedParticipants = hearing.participants
             .filter(x => x.email)
@@ -17,7 +32,8 @@ export class ScreeningFormComponent {
                 participant =>
                     ({
                         displayName: participant.display_name,
-                        externalReferenceId: participant.externalReferenceId
+                        externalReferenceId: participant.externalReferenceId,
+                        isNewlyAdded: participant.id === null || participant.id === undefined
                     } as GenericParticipantsModel)
             );
 
@@ -25,28 +41,18 @@ export class ScreeningFormComponent {
             endpoint =>
                 ({
                     displayName: endpoint.displayName,
-                    externalReferenceId: endpoint.externalReferenceId
+                    externalReferenceId: endpoint.externalReferenceId,
+                    isNewlyAdded: endpoint.id === null || endpoint.id === undefined
                 } as GenericParticipantsModel)
         );
-
-        this.allParticipants = [...mappedParticipants, ...mappedEndpoints];
+        this.isEditMode = hearing.hearing_id !== null && hearing.hearing_id !== undefined;
+        this.allParticipants = [...mappedParticipants, ...mappedEndpoints].filter(participant =>
+            this.includeParticipantInScreeningOptions(participant)
+        );
         this.createForm();
         this.cdRef.detectChanges();
     }
 
-    @Output() screeningSaved = new EventEmitter<SelectedScreeningDto>();
-
-    displayMeasureType = false;
-    displayProtectFromList = false;
-    allParticipants: GenericParticipantsModel[];
-    availableProtectParticipantFromList: GenericParticipantsModel[] = [];
-    selectedProtectParticipantFromList: GenericParticipantsModel[] = [];
-
-    destroyed$ = new Subject<void>();
-    form: FormGroup<ScreeningSelectParticipantForm>;
-
-    constructor(private formBuilder: FormBuilder, private cdRef: ChangeDetectorRef, private logger: Logger) {}
-
     createForm() {
         this.form = this.formBuilder.group<ScreeningSelectParticipantForm>({
             displayName: new FormControl(null),
@@ -69,19 +75,19 @@ export class ScreeningFormComponent {
     onMeasureTypeSelected(measureType: ScreeningType, participantDisplayName: string) {
         this.displayProtectFromList = measureType === 'Specific';
         if (measureType === 'Specific') {
-            const particpant = this.allParticipants.find(participant => participant.displayName === participantDisplayName);
-            this.initaliseScreening(particpant.displayName);
+            const participantsModel = this.allParticipants.find(participant => participant.displayName === participantDisplayName);
+            this.initialiseScreening(participantsModel.displayName);
             this.selectedProtectParticipantFromList = [];
         }
     }
 
     onParticipantSelected(displayName: string): void {
         this.displayMeasureType = false;
-        this.initaliseScreening(displayName);
+        this.initialiseScreening(displayName);
         this.selectedProtectParticipantFromList = [];
     }
 
-    initaliseScreening(displayName: string) {
+    initialiseScreening(displayName: string) {
         this.availableProtectParticipantFromList = this.allParticipants.filter(participant => participant.displayName !== displayName);
     }
 
@@ -99,6 +105,18 @@ export class ScreeningFormComponent {
         this.displayMeasureType = false;
         this.displayProtectFromList = false;
     }
+
+    /// VIH-11046: due to the way updating a hearing orchestrates updating participants and endpoints in two separate requests to the booking-api,
+    // we need to restrict the ability to add a screening link between a newly added participant and newly added endpoints else the id won't be available to link the two.
+    // The user needs to save booking first then add a screening option.
+    // this can be removed in future if the way we change how updating hearing participants works.
+    private includeParticipantInScreeningOptions(participant: GenericParticipantsModel): boolean {
+        if (this.isEditMode && participant.isNewlyAdded) {
+            this.newParticipantRemovedFromOptions = true;
+            return false;
+        }
+        return true;
+    }
 }
 
 interface ScreeningSelectParticipantForm {
@@ -109,4 +127,5 @@ interface ScreeningSelectParticipantForm {
 interface GenericParticipantsModel {
     displayName: string;
     externalReferenceId: string;
+    isNewlyAdded: boolean;
 }
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.html
index 7110ea036..a52f9392e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.html
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.html
@@ -11,7 +11,7 @@
   </div>
   <div class="govuk-!-margin-left-3" *ngIf="model.measureType === 'Specific'">
     <ul class="govuk-list govuk-list--bullet">
-      <li class="govuk-body-s" *ngFor="let protectedFrom of model.protectFrom">{{ protectedFrom.displayName }}</li>
+      <li *ngFor="let protectedFrom of model.protectFrom" class="govuk-body-s">{{ protectedFrom?.displayName }}</li>
     </ul>
   </div>
 </div>
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
index 2f888408c..6a542420e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
@@ -4,7 +4,7 @@ import { ScreeningListItemComponent } from './screening-list-item.component';
 import { EndpointModel } from 'src/app/common/model/endpoint.model';
 import { HearingModel } from 'src/app/common/model/hearing.model';
 import { ParticipantModel } from 'src/app/common/model/participant.model';
-import { SimpleChanges, SimpleChange } from '@angular/core';
+import { SimpleChange, SimpleChanges } from '@angular/core';
 
 describe('ScreeningListItemComponent', () => {
     let component: ScreeningListItemComponent;
@@ -28,11 +28,11 @@ describe('ScreeningListItemComponent', () => {
         };
         hearing.participants = [participantWithoutScreening, participantWithScreening];
 
-        const endpointWithoutScreening = new EndpointModel();
+        const endpointWithoutScreening = new EndpointModel(null);
         endpointWithoutScreening.id = '3';
         endpointWithoutScreening.displayName = 'Endpoint No Screening';
 
-        const endpointWithScreening = new EndpointModel();
+        const endpointWithScreening = new EndpointModel(null);
         endpointWithScreening.id = '4';
         endpointWithScreening.displayName = 'Endpoint With Screening';
         endpointWithScreening.screening = {
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
index 5924270b6..59b461265 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ScreeningListComponent } from './screening-list.component';
 import { HearingModel } from 'src/app/common/model/hearing.model';
@@ -26,11 +26,11 @@ describe('ScreeningListComponent', () => {
         };
         hearing.participants = [participantWithoutScreening, participantWithScreening];
 
-        const endpointWithoutScreening = new EndpointModel();
+        const endpointWithoutScreening = new EndpointModel(null);
         endpointWithoutScreening.id = '3';
         endpointWithoutScreening.displayName = 'Endpoint No Screening';
 
-        const endpointWithScreening = new EndpointModel();
+        const endpointWithScreening = new EndpointModel(null);
         endpointWithScreening.id = '4';
         endpointWithScreening.displayName = 'Endpoint With Screening';
         endpointWithScreening.screening = {
@@ -67,7 +67,7 @@ describe('ScreeningListComponent', () => {
     describe('onEndpointScreeningDeleted', () => {
         it('should emit deleteEndpointScreening event', () => {
             // Arrange
-            const endpoint = new EndpointModel();
+            const endpoint = new EndpointModel(null);
             spyOn(component.deleteEndpointScreening, 'emit');
 
             // Act
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
index b38ff91f1..369e6ed88 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
@@ -849,11 +849,11 @@ describe('SummaryComponent  with existing request', () => {
         component.hearing = initExistingHearingRequest();
         component.hearing.hearing_id = '12345';
         component.hearing.endpoints = [];
-        const ep1 = new EndpointModel();
+        const ep1 = new EndpointModel(null);
         ep1.displayName = 'test endpoint 001';
-        const ep2 = new EndpointModel();
+        const ep2 = new EndpointModel(null);
         ep2.displayName = 'test endpoint 002';
-        const ep3 = new EndpointModel();
+        const ep3 = new EndpointModel(null);
         ep3.displayName = 'test endpoint 003';
         component.hearing.endpoints.push(ep1);
         component.hearing.endpoints.push(ep2);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.spec.ts
index 2136dd7ca..dfbc80408 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.spec.ts
@@ -12,7 +12,6 @@ import { BookingPersistService } from '../../services/bookings-persist.service';
 import {
     BookingStatus,
     HearingDetailsResponse,
-    JusticeUserResponse,
     PhoneConferenceResponse,
     UpdateBookingStatusResponse,
     UserProfileResponse
@@ -136,10 +135,10 @@ export class BookingDetailsTestData {
 
     getEndpoints() {
         const endpoints: EndpointModel[] = [];
-        let endpoint = new EndpointModel();
+        let endpoint = new EndpointModel(null);
         endpoint.displayName = 'Courtroom 001';
         endpoints.push(endpoint);
-        endpoint = new EndpointModel();
+        endpoint = new EndpointModel(null);
         endpoint.displayName = 'Courtroom 002';
         endpoints.push(endpoint);
         return endpoints;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/copy-sip/copy-sip.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/copy-sip/copy-sip.component.spec.ts
index 1bee77870..8fad1b25b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/copy-sip/copy-sip.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/copy-sip/copy-sip.component.spec.ts
@@ -49,7 +49,7 @@ describe('CopySipComponent', () => {
         expect(component.displayTooltip).toBeTruthy();
     });
     it('should copy the endpoint sip address and pin to the clipboard', () => {
-        const endpoint = new EndpointModel();
+        const endpoint = new EndpointModel(null);
         endpoint.sip = '12345@12345';
         endpoint.pin = '3000';
         const address = endpoint.sip + ':' + endpoint.pin;
@@ -61,7 +61,7 @@ describe('CopySipComponent', () => {
         expect(component.tooltip).toBe('Address copied to clipboard');
     });
     it('should set on input details to copy', () => {
-        const endPointModel = new EndpointModel();
+        const endPointModel = new EndpointModel(null);
         endPointModel.pin = 'pin';
         endPointModel.sip = 'sip';
         component.endpoint = endPointModel;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/endpoint.model.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/endpoint.model.ts
index 421f28815..b9ead31fa 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/endpoint.model.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/endpoint.model.ts
@@ -3,11 +3,12 @@ import { ScreeningDto } from 'src/app/booking/screening/screening.model';
 import { v4 as uuid } from 'uuid';
 
 export class EndpointModel {
-    constructor() {
-        this.externalReferenceId = uuid();
-    }
+    externalReferenceId: string;
     id?: string | undefined;
-    externalReferenceId?: string | undefined;
+
+    constructor(externalReferenceId: string) {
+        this.externalReferenceId = externalReferenceId || uuid();
+    }
     displayName?: string | undefined;
     sip?: string | undefined;
     pin?: string | undefined;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/booking-details.service.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/booking-details.service.ts
index 64b4833af..4e286967c 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/booking-details.service.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/booking-details.service.ts
@@ -111,7 +111,7 @@ export class BookingDetailsService {
         if (hearingResponse.endpoints && hearingResponse.endpoints.length > 0) {
             hearingResponse.endpoints.forEach(e => {
                 const defenceAdvocate = hearingResponse.participants.find(p => p.id === e.defence_advocate_id);
-                const epModel = new EndpointModel();
+                const epModel = new EndpointModel(e.external_reference_id);
                 epModel.id = e.id;
                 epModel.externalReferenceId = e.external_reference_id;
                 epModel.displayName = e.display_name;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
index ddab40c6e..d62ef6f37 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
@@ -1,28 +1,27 @@
 import { VideoHearingsService } from './video-hearings.service';
 import {
+    AppHealthStatusResponse,
     BHClient,
-    HearingDetailsResponse,
-    CaseResponse,
-    ParticipantResponse,
+    BookingStatus,
+    CancelMultiDayHearingRequest,
     CaseAndHearingRolesResponse,
-    EndpointResponse,
-    MultiHearingRequest,
+    CaseResponse,
     ClientSettingsResponse,
+    EditMultiDayHearingRequest,
+    EndpointResponse,
+    HearingDetailsResponse,
     HearingRole,
-    LinkedParticipantResponse,
-    BookingStatus,
-    JusticeUserResponse,
     JudiciaryParticipantResponse,
-    EditMultiDayHearingRequest,
-    CancelMultiDayHearingRequest,
+    LinkedParticipantResponse,
+    MultiHearingRequest,
+    ParticipantResponse,
     UpdateHearingInGroupRequest,
-    AppHealthStatusResponse,
     VideoSupplier
 } from './clients/api-client';
 import { HearingModel } from '../common/model/hearing.model';
 import { CaseModel } from '../common/model/case.model';
 import { ParticipantModel } from '../common/model/participant.model';
-import { lastValueFrom, of } from 'rxjs';
+import { of } from 'rxjs';
 import { EndpointModel } from '../common/model/endpoint.model';
 import { LinkedParticipantModel, LinkedParticipantType } from '../common/model/linked-participant.model';
 import { JudicialMemberDto } from '../booking/judicial-office-holders/models/add-judicial-member.model';
@@ -404,7 +403,7 @@ describe('Video hearing service', () => {
         hearingModel.cases = [caseModel];
         hearingModel.audio_recording_required = true;
         const endpoints: EndpointModel[] = [];
-        const endpoint = new EndpointModel();
+        const endpoint = new EndpointModel(null);
         endpoint.displayName = 'endpoint 001';
         endpoints.push(endpoint);
         hearingModel.endpoints = endpoints;
@@ -474,7 +473,7 @@ describe('Video hearing service', () => {
         hearingModel.cases = [caseModel];
         hearingModel.audio_recording_required = true;
         const endpoints: EndpointModel[] = [];
-        const endpoint = new EndpointModel();
+        const endpoint = new EndpointModel(null);
         endpoint.displayName = 'court room1';
         endpoints.push(endpoint);
         hearingModel.endpoints = endpoints;
@@ -519,7 +518,7 @@ describe('Video hearing service', () => {
 
     it('should map EndpointModel toEndpointResponse', () => {
         const endpoints: EndpointModel[] = [];
-        const endpoint = new EndpointModel();
+        const endpoint = new EndpointModel(null);
         endpoint.displayName = 'court room 001';
         endpoints.push(endpoint);
 
@@ -889,7 +888,7 @@ describe('Video hearing service', () => {
         );
         hearing.participants = participants;
         const endpoints: EndpointModel[] = [];
-        const endpoint = new EndpointModel();
+        const endpoint = new EndpointModel(null);
         endpoint.id = 'b3e1521e-9e0e-496e-4cc9-08dc1682b559';
         endpoint.displayName = 'Endpoint A';
         endpoints.push(endpoint);
@@ -1065,7 +1064,7 @@ describe('Video hearing service', () => {
                 spokenLanguageCode: 'fr',
                 interpreterRequired: true
             };
-            const endpoint = new EndpointModel();
+            const endpoint = new EndpointModel(null);
             endpoint.interpretationLanguage = language;
             endpoints.push(endpoint);
 
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
index 311fab681..60723f016 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
@@ -2,34 +2,34 @@ import { Injectable } from '@angular/core';
 import { firstValueFrom, lastValueFrom, Observable } from 'rxjs';
 import {
     BHClient,
+    BookHearingRequest,
     BookingDetailsRequest,
+    BookingStatus,
+    CancelMultiDayHearingRequest,
     CaseAndHearingRolesResponse,
     CaseRequest,
     CaseResponse,
     EditCaseRequest,
     EditEndpointRequest,
     EditHearingRequest,
+    EditMultiDayHearingRequest,
     EditParticipantRequest,
     EndpointRequest,
     EndpointResponse,
     HearingDetailsResponse,
+    HearingRoleResponse,
     HearingTypeResponse,
+    JudiciaryParticipantRequest,
+    LinkedParticipant,
+    LinkedParticipantRequest,
+    LinkedParticipantResponse,
+    MultiHearingRequest,
     ParticipantRequest,
     ParticipantResponse,
-    UpdateBookingStatusResponse,
-    MultiHearingRequest,
     PhoneConferenceResponse,
-    BookHearingRequest,
-    LinkedParticipantRequest,
-    LinkedParticipantResponse,
-    LinkedParticipant,
-    BookingStatus,
-    HearingRoleResponse,
-    JudiciaryParticipantRequest,
-    EditMultiDayHearingRequest,
-    CancelMultiDayHearingRequest,
-    UpdateHearingInGroupRequest,
-    SpecialMeasureScreeningRequest
+    SpecialMeasureScreeningRequest,
+    UpdateBookingStatusResponse,
+    UpdateHearingInGroupRequest
 } from './clients/api-client';
 import { HearingModel } from '../common/model/hearing.model';
 import { CaseModel } from '../common/model/case.model';
@@ -535,7 +535,7 @@ export class VideoHearingsService {
         if (response && response.length > 0) {
             response.forEach(e => {
                 const defenceAdvocate = participants.find(p => p.id === e.defence_advocate_id);
-                endpoint = new EndpointModel();
+                endpoint = new EndpointModel(e.external_reference_id);
                 endpoint.id = e.id;
                 endpoint.displayName = e.display_name;
                 endpoint.pin = e.pin;
@@ -543,10 +543,6 @@ export class VideoHearingsService {
                 endpoint.defenceAdvocate = defenceAdvocate?.contact_email;
                 endpoint.interpretationLanguage = InterpreterSelectedDto.fromAvailableLanguageResponse(e.interpreter_language);
                 endpoint.screening = mapScreeningResponseToScreeningDto(e.screening_requirement);
-                if (e.external_reference_id) {
-                    // only override the external reference id if it is not null else EndpointModel will initialise to a UUID in the ctor
-                    endpoint.externalReferenceId = e.external_reference_id;
-                }
                 endpoints.push(endpoint);
             });
         }