diff --git a/desktop/flipper-common/src/server-types.tsx b/desktop/flipper-common/src/server-types.tsx
index 23ac91305..44f7a8724 100644
--- a/desktop/flipper-common/src/server-types.tsx
+++ b/desktop/flipper-common/src/server-types.tsx
@@ -92,13 +92,11 @@ export type ClientQuery = {
   rsocket?: boolean;
 };
 
-export type ClientCsrQuery = {
+export type SecureClientQuery = ClientQuery & {
   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/ServerController.tsx b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
index 3cc8fecdf..a501d0e5f 100644
--- a/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
+++ b/desktop/flipper-server-core/src/app-connectivity/ServerController.tsx
@@ -57,11 +57,6 @@ type ClientInfo = {
   client: ClientDescription;
 };
 
-type ClientCsrQuery = {
-  csr?: string | undefined;
-  csr_path?: string | undefined;
-};
-
 /**
  * Responsible of creating and managing the actual underlying servers:
  * - Insecure (used for certificate exchange)
@@ -202,8 +197,9 @@ export class ServerController
         sdk_version,
         medium,
         rsocket,
+        csr,
+        csr_path,
       },
-      {csr, csr_path},
       downgrade,
     );
   }
@@ -423,15 +419,14 @@ export class ServerController
    */
   async addConnection(
     connection: ClientConnection,
-    query: ClientQuery,
-    csrQuery: ClientCsrQuery,
+    query: SecureClientQuery,
     silentReplace?: boolean,
   ): Promise<ClientDescription> {
     invariant(query, 'expected query');
 
     // try to get id by comparing giving `csr` to file from `csr_path`
     // otherwise, use given device_id
-    const {csr_path, csr} = csrQuery;
+    const {csr_path, csr} = query;
 
     // For Android, device id might change
     if (csr_path && csr && query.os === 'Android') {