diff --git a/app/main.ts b/app/main.ts
index e68c84c272..5c5c8ae788 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -2729,6 +2729,7 @@ ipc.on('get-config', async event => {
         : getEnvironment(),
     isMockTestEnvironment: Boolean(process.env.MOCK_TEST),
     ciMode,
+    devTools: defaultWebPrefs.devTools,
     // Should be already computed and cached at this point
     dnsFallback: await getDNSFallback(),
     disableIPv6: DISABLE_IPV6,
diff --git a/ts/types/RendererConfig.ts b/ts/types/RendererConfig.ts
index e113105ad4..3fad2c0a89 100644
--- a/ts/types/RendererConfig.ts
+++ b/ts/types/RendererConfig.ts
@@ -40,6 +40,7 @@ export const rendererConfigSchema = z.object({
   contentProxyUrl: configRequiredStringSchema,
   crashDumpsPath: configRequiredStringSchema,
   ciMode: z.enum(['full', 'benchmark']).or(z.literal(false)),
+  devTools: z.boolean(),
   disableIPv6: z.boolean(),
   dnsFallback: DNSFallbackSchema,
   ciBackupPath: configOptionalStringSchema,
diff --git a/ts/windows/main/start.ts b/ts/windows/main/start.ts
index 2e47f0e464..fc8e022f11 100644
--- a/ts/windows/main/start.ts
+++ b/ts/windows/main/start.ts
@@ -48,7 +48,10 @@ window.Whisper.events = clone(window.Backbone.Events);
 initMessageCleanup();
 startConversationController();
 
-if (!isProduction(window.SignalContext.getVersion())) {
+if (
+  !isProduction(window.SignalContext.getVersion()) ||
+  window.SignalContext.config.devTools
+) {
   const SignalDebug = {
     cdsLookup: (options: CdsLookupOptionsType) =>
       window.textsecure.server?.cdsLookup(options),