diff --git a/desktop/app/src/Client.tsx b/desktop/app/src/Client.tsx
index 68a9108aa..a8579ceea 100644
--- a/desktop/app/src/Client.tsx
+++ b/desktop/app/src/Client.tsx
@@ -9,7 +9,6 @@
 
 import {
   PluginDefinition,
-  ClientPluginDefinition,
   isSandyPlugin,
   FlipperPlugin,
   FlipperDevicePlugin,
diff --git a/desktop/app/src/reducers/connections.tsx b/desktop/app/src/reducers/connections.tsx
index 9a6800d57..65440f05d 100644
--- a/desktop/app/src/reducers/connections.tsx
+++ b/desktop/app/src/reducers/connections.tsx
@@ -246,7 +246,15 @@ export default (state: State = INITAL_STATE, action: Actions): State => {
           }
         }
       }
-      if (!selectDevice) {
+      if (!selectedDevice && selectedPlugin) {
+        const selectedClient = state.clients.find((c) =>
+          c.supportsPlugin(selectedPlugin),
+        );
+        selectedDevice = state.devices.find(
+          (v) => v.serial === selectedClient?.query.device_id,
+        );
+      }
+      if (!selectedDevice) {
         console.warn('Trying to select a plugin before a device was selected!');
       }
       if (selectedPlugin) {