diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
index fecffee88..7c9ac6119 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -32,6 +32,7 @@ import {brandColors, brandIcons, colors} from '../../ui/components/colors';
 import {TroubleshootingGuide} from './fb-stubs/TroubleshootingGuide';
 import {getSelectableDevices} from '../../selectors/connections';
 import {getRenderHostInstance} from 'flipper-frontend-core';
+import {NoDevices} from './NoDevices';
 
 const {Text} = Typography;
 
@@ -82,6 +83,9 @@ export function AppSelector() {
     onSelectApp,
   );
   const client = clients.get(selectedAppId!);
+  const gkSelfSufficiency = getRenderHostInstance().GK(
+    'flipper_self_sufficiency',
+  );
 
   return (
     <>
@@ -133,10 +137,14 @@ export function AppSelector() {
           </Text>
         </Layout.Horizontal>
       )}
-      <TroubleshootingGuide
-        showGuide={getRenderHostInstance().GK('flipper_self_sufficiency')}
-        devicesDetected={entries.length}
-      />
+      {
+        /* Return the public component NoDevices if showGuide is false (This means that the user is not in the GK Allowlist) and no devices are detected */
+        !gkSelfSufficiency && entries.length == 0 ? (
+          <NoDevices />
+        ) : !gkSelfSufficiency && entries.length > 0 ? null : (
+          <TroubleshootingGuide />
+        )
+      }
     </>
   );
 }
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
index 456004303..05f09c447 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
@@ -7,15 +7,6 @@
  * @format
  */
 
-import React from 'react';
-import {NoDevices} from '../NoDevices';
-
-export function TroubleshootingGuide(_props: {
-  showGuide: boolean;
-  devicesDetected: number;
-}) {
-  if (_props.devicesDetected == 0) return <NoDevices />;
-  else {
-    return <></>;
-  }
+export function TroubleshootingGuide() {
+  return null;
 }