diff --git a/ts/signal.ts b/ts/signal.ts
index 33123a1f7..644beaa8f 100644
--- a/ts/signal.ts
+++ b/ts/signal.ts
@@ -10,7 +10,9 @@ import * as Curve from './Curve';
 import { start as conversationControllerStart } from './ConversationController';
 import * as Groups from './groups';
 import OS from './util/os/osMain';
+import { isProduction } from './util/version';
 import * as RemoteConfig from './RemoteConfig';
+import { DataReader, DataWriter } from './sql/Client';
 
 // Components
 import { ConfirmationDialog } from './components/ConfirmationDialog';
@@ -463,5 +465,12 @@ export const setup = (options: {
     Services,
     State,
     Types,
+
+    ...(isProduction(window.getVersion())
+      ? {}
+      : {
+          DataReader,
+          DataWriter,
+        }),
   };
 };
diff --git a/ts/window.d.ts b/ts/window.d.ts
index d88f08ec8..bc48fdeff 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -170,6 +170,10 @@ export type SignalCoreType = {
   };
   conversationControllerStart: () => void;
   challengeHandler?: ChallengeHandler;
+
+  // Only for debugging in Dev Tools
+  DataReader?: unknown;
+  DataWriter?: unknown;
 };
 
 declare global {