diff --git a/desktop/flipper-common/src/server-types.tsx b/desktop/flipper-common/src/server-types.tsx
index 027418632..23ac91305 100644
--- a/desktop/flipper-common/src/server-types.tsx
+++ b/desktop/flipper-common/src/server-types.tsx
@@ -92,6 +92,13 @@ export type ClientQuery = {
   rsocket?: boolean;
 };
 
+export type ClientCsrQuery = {
+  csr?: string | undefined;
+  csr_path?: string | undefined;
+};
+
+export type SecureClientQuery = ClientQuery & ClientCsrQuery;
+
 export type ClientDescription = {
   readonly id: string;
   readonly query: ClientQuery;
diff --git a/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
index d1c97a3c9..72512b872 100644
--- a/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/BrowserServerWebSocket.tsx
@@ -16,8 +16,7 @@ import {assertNotNull, parseClientQuery} from './Utilities';
 import SecureServerWebSocket, {
   SecureConnectionCtx,
 } from './SecureServerWebSocket';
-import {SecureClientQuery} from './ServerWebSocketBase';
-import {ClientDescription, DeviceOS} from 'flipper-common';
+import {ClientDescription, DeviceOS, SecureClientQuery} from 'flipper-common';
 import {URL} from 'url';
 import {isFBBuild} from '../fb-stubs/constants';
 
diff --git a/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
index 9681ad7d2..373e341be 100644
--- a/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/SecureServerWebSocket.tsx
@@ -8,9 +8,8 @@
  */
 
 import ServerWebSocket, {ConnectionCtx} from './ServerWebSocket';
-import {SecureClientQuery} from './ServerWebSocketBase';
 import {ParsedUrlQuery} from 'querystring';
-import {ClientDescription} from 'flipper-common';
+import {ClientDescription, SecureClientQuery} from 'flipper-common';
 import {
   isWsResponseMessage,
   parseSecureClientQuery,
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
index e351c511c..3cc8fecdf 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
@@ -10,6 +10,7 @@
 import {
   ClientDescription,
   ClientQuery,
+  SecureClientQuery,
   isTest,
   buildClientId,
   Logger,
@@ -27,10 +28,7 @@ import {
   assertNotNull,
   cloneClientQuerySafeForLogging,
 } from './Utilities';
-import ServerWebSocketBase, {
-  SecureClientQuery,
-  ServerEventsListener,
-} from './ServerWebSocketBase';
+import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
 import {
   createBrowserServer,
   createServer,
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
index 223f8eca1..59db23943 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerRSocket.tsx
@@ -7,11 +7,7 @@
  * @format
  */
 
-import {SecureServerConfig} from './certificate-exchange/certificate-utils';
-import ServerWebSocketBase, {
-  SecureClientQuery,
-  ServerEventsListener,
-} from './ServerWebSocketBase';
+import ServerWebSocketBase, {ServerEventsListener} from './ServerWebSocketBase';
 import tls from 'tls';
 import net, {AddressInfo, Socket} from 'net';
 import {RSocketServer} from 'rsocket-core';
@@ -27,8 +23,10 @@ import {
   ClientDescription,
   ClientQuery,
   ClientResponseType,
+  SecureClientQuery,
 } from 'flipper-common';
 import {transformCertificateExchangeMediumToType} from './Utilities';
+import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 
 /**
  * RSocket based server. RSocket uses its own protocol for communication between
diff --git a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
index 22b9fb430..b7ae2824e 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerWebSocketBase.tsx
@@ -11,25 +11,11 @@ import {ClientConnection} from './ClientConnection';
 import {
   ClientDescription,
   ClientQuery,
+  SecureClientQuery,
   SignCertificateMessage,
 } from 'flipper-common';
 import {SecureServerConfig} from './certificate-exchange/certificate-utils';
 
-/**
- * ClientCsrQuery defines a client query with CSR
- * information.
- */
-export type ClientCsrQuery = {
-  csr?: string | undefined;
-  csr_path?: string | undefined;
-};
-
-/**
- * SecureClientQuery combines a ClientQuery with
- * ClientCsrQuery. It also adds medium information.
- */
-export type SecureClientQuery = ClientQuery & ClientCsrQuery;
-
 /**
  * Defines an interface for events triggered by a running server interacting
  * with a client.
diff --git a/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx b/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
index 0f4936ce8..12dd0405e 100644
--- a/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/Utilities.tsx
@@ -10,11 +10,11 @@
 import {
   CertificateExchangeMedium,
   ClientQuery,
+  SecureClientQuery,
   DeviceOS,
   ResponseMessage,
 } from 'flipper-common';
 import {ParsedUrlQuery} from 'querystring';
-import {SecureClientQuery} from './ServerWebSocketBase';
 
 /**
  * Transforms the certificate exchange medium type as number to the
diff --git a/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
index 21f64632d..702c85e66 100644
--- a/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/__tests__/BrowserServerWebSocket.node.tsx
@@ -12,13 +12,13 @@ import {
   ExecuteMessage,
   GetPluginsMessage,
   ResponseMessage,
+  SecureClientQuery,
 } from 'flipper-common';
 import WebSocket from 'ws';
 
 import {BrowserClientConnection} from '../BrowserClientConnection';
 import {getFlipperServerConfig} from '../../FlipperServerConfig';
 import BrowserServerWebSocket from '../BrowserServerWebSocket';
-import {SecureClientQuery} from '../ServerWebSocketBase';
 import {createMockSEListener, WSMessageAccumulator} from './utils';
 
 jest.mock('../../FlipperServerConfig');
diff --git a/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx b/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
index 285aa6a14..8b66bc296 100644
--- a/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/__tests__/SecureServerWebSocket.node.tsx
@@ -12,12 +12,12 @@ import {
   ExecuteMessage,
   GetPluginsMessage,
   ResponseMessage,
+  SecureClientQuery,
 } from 'flipper-common';
 import {toBase64} from 'js-base64';
 import WebSocket from 'ws';
 
 import SecureServerWebSocket from '../SecureServerWebSocket';
-import {SecureClientQuery} from '../ServerWebSocketBase';
 import {transformCertificateExchangeMediumToType} from '../Utilities';
 import WebSocketClientConnection from '../WebSocketClientConnection';
 import {createMockSEListener, WSMessageAccumulator} from './utils';