diff --git a/ts/environment.ts b/ts/environment.ts
index a92249c6e9..e3ee9f44df 100644
--- a/ts/environment.ts
+++ b/ts/environment.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { makeEnumParser } from './util/enum';
+import * as log from './logging/log';
 
 // Many places rely on this enum being a string.
 export enum Environment {
@@ -49,7 +50,9 @@ export const isTestEnvironment = (env: Environment): boolean =>
 
 export const isTestOrMockEnvironment = (): boolean => {
   if (isMockTestEnvironment == null) {
-    throw new Error('Mock test environment not set');
+    log.error('Mock test environment not set');
   }
-  return isTestEnvironment(getEnvironment()) || isMockTestEnvironment;
+  return (
+    isTestEnvironment(getEnvironment()) || (isMockTestEnvironment ?? false)
+  );
 };
diff --git a/ts/windows/screenShare/app.tsx b/ts/windows/screenShare/app.tsx
index 0f29bcca6e..60e8dac794 100644
--- a/ts/windows/screenShare/app.tsx
+++ b/ts/windows/screenShare/app.tsx
@@ -7,11 +7,17 @@ import ReactDOM from 'react-dom';
 import { CallingScreenSharingController } from '../../components/CallingScreenSharingController';
 import { i18n } from '../sandboxedInit';
 import { strictAssert } from '../../util/assert';
+import { parseEnvironment, setEnvironment } from '../../environment';
 
 const { ScreenShareWindowProps } = window.Signal;
 
 strictAssert(ScreenShareWindowProps, 'window values not provided');
 
+setEnvironment(
+  parseEnvironment(window.SignalContext.getEnvironment()),
+  window.SignalContext.isTestOrMockEnvironment()
+);
+
 ReactDOM.render(
   <div className="App dark-theme">
     <CallingScreenSharingController