diff --git a/desktop/app/src/devices/BaseDevice.tsx b/desktop/app/src/devices/BaseDevice.tsx
index b55ec88b3..59fcff3f2 100644
--- a/desktop/app/src/devices/BaseDevice.tsx
+++ b/desktop/app/src/devices/BaseDevice.tsx
@@ -225,6 +225,7 @@ export default class BaseDevice {
   }
 
   disconnect() {
+    this.logListeners.clear();
     this.connected.set(false);
   }
 
diff --git a/desktop/app/src/sandy-chrome/appinspect/PluginList.tsx b/desktop/app/src/sandy-chrome/appinspect/PluginList.tsx
index f9edf59a9..3371b93ab 100644
--- a/desktop/app/src/sandy-chrome/appinspect/PluginList.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/PluginList.tsx
@@ -86,6 +86,8 @@ export const PluginList = memo(function PluginList({
     pluginsChanged,
   ]);
   const isConnected = useValue(activeDevice?.connected, false);
+  const metroConnected = useValue(metroDevice?.connected, false);
+  const isArchived = activeDevice?.isArchived;
 
   const annotatedDownloadablePlugins = useMemoize<
     [
@@ -198,7 +200,7 @@ export const PluginList = memo(function PluginList({
             ))}
           </PluginGroup>
 
-          {isConnected && (
+          {!isArchived && metroConnected && (
             <PluginGroup
               key="metro"
               title="React Native"