diff --git a/desktop/app/src/devices/FlipperSelfInspectionDevice.tsx b/desktop/app/src/devices/FlipperSelfInspectionDevice.tsx
deleted file mode 100644
index a1b7a7408..000000000
--- a/desktop/app/src/devices/FlipperSelfInspectionDevice.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-import BaseDevice, {OS} from './BaseDevice';
-import type {DeviceType} from 'flipper-plugin';
-
-export default class FlipperSelfInspectionDevice extends BaseDevice {
-  constructor(serial: string, deviceType: DeviceType, title: string, os: OS) {
-    super(serial, deviceType, title, os);
-    this.devicePlugins = [];
-  }
-}
diff --git a/desktop/app/src/utils/self-inspection/selfInspectionUtils.tsx b/desktop/app/src/utils/self-inspection/selfInspectionUtils.tsx
index d256d84b2..d27969728 100644
--- a/desktop/app/src/utils/self-inspection/selfInspectionUtils.tsx
+++ b/desktop/app/src/utils/self-inspection/selfInspectionUtils.tsx
@@ -9,7 +9,6 @@
 
 import Client, {ClientQuery} from '../../Client';
 import {FlipperClientConnection} from '../../Client';
-import FlipperSelfInspectionDevice from '../../devices/FlipperSelfInspectionDevice';
 import {Store} from '../../reducers';
 import {Logger} from '../../fb-interfaces/Logger';
 
@@ -31,25 +30,21 @@ export function initSelfInpector(
   >,
 ) {
   const appName = 'Flipper';
-  const device_id = 'FlipperSelfInspectionDevice';
-  const device = new FlipperSelfInspectionDevice(
-    device_id,
-    'emulator',
-    appName,
-    'JSWebApp',
-  );
-  store.dispatch({
-    type: 'REGISTER_DEVICE',
-    payload: device,
-  });
 
   selfInspectionClient.addPlugin(flipperMessagesClientPlugin);
+  const hostDevice = store
+    .getState()
+    .connections.devices.find((d) => d.serial === '');
+  if (!hostDevice) {
+    console.error('Failed to find host device for self inspector');
+    return;
+  }
 
   const query: ClientQuery = {
     app: appName,
-    os: 'JSWebApp',
+    os: 'MacOS',
     device: 'emulator',
-    device_id,
+    device_id: '',
     sdk_version: 4,
   };
   const clientId = buildClientId(query);
@@ -61,7 +56,7 @@ export function initSelfInpector(
     logger,
     store,
     undefined,
-    device,
+    hostDevice,
   );
 
   flipperConnections.set(clientId, {