diff --git a/src/components/PreJoinScreens/PreJoinScreens.test.tsx b/src/components/PreJoinScreens/PreJoinScreens.test.tsx
index 5be07a229..d009c7dca 100644
--- a/src/components/PreJoinScreens/PreJoinScreens.test.tsx
+++ b/src/components/PreJoinScreens/PreJoinScreens.test.tsx
@@ -143,7 +143,8 @@ describe('the PreJoinScreens component', () => {
   });
 
   it('should capture errors from getAudioAndVideoTracks and pass them to the MediaErrorSnackbar component', async () => {
-    mockUseVideoContext.mockImplementation(() => ({ getAudioAndVideoTracks: () => Promise.reject('testError') }));
+    const mockGetAudioAndVideoTracks = jest.fn(() => Promise.reject('testError'));
+    mockUseVideoContext.mockImplementation(() => ({ getAudioAndVideoTracks: mockGetAudioAndVideoTracks }));
 
     const wrapper = mount(<PreJoinScreens />);
 
@@ -155,5 +156,6 @@ describe('the PreJoinScreens component', () => {
 
     const error = wrapper.children().prop('subContent').props.children[1].props.error;
     expect(error).toBe('testError');
+    expect(mockGetAudioAndVideoTracks).toHaveBeenCalledTimes(1); // This makes sure that 'getAudioAndVideoTracks' isn't called repeatedly
   });
 });
diff --git a/src/components/PreJoinScreens/PreJoinScreens.tsx b/src/components/PreJoinScreens/PreJoinScreens.tsx
index 347efedca..0967992e2 100644
--- a/src/components/PreJoinScreens/PreJoinScreens.tsx
+++ b/src/components/PreJoinScreens/PreJoinScreens.tsx
@@ -35,14 +35,14 @@ export default function PreJoinScreens() {
   }, [user, URLRoomName]);
 
   useEffect(() => {
-    if (step === Steps.deviceSelectionStep) {
+    if (step === Steps.deviceSelectionStep && !mediaError) {
       getAudioAndVideoTracks().catch(error => {
         console.log('Error acquiring local media:');
         console.dir(error);
         setMediaError(error);
       });
     }
-  }, [getAudioAndVideoTracks, step]);
+  }, [getAudioAndVideoTracks, step, mediaError]);
 
   const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();