diff --git a/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx b/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx
index 4a1fd2395..db6939fe1 100644
--- a/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx
+++ b/desktop/flipper-plugin/src/plugin/DevicePlugin.tsx
@@ -97,7 +97,10 @@ export class SandyDevicePluginInstance extends BasePluginInstance {
     this.initializePlugin(() =>
       definition.asDevicePluginModule().devicePlugin(this.client),
     );
-    this.startServerAddOn();
+    // Do not start server add-ons for archived devices
+    if (this.device.connected.get()) {
+      this.startServerAddOn();
+    }
   }
 
   toJSON() {