diff --git a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
index b5e95a036..e8297db95 100644
--- a/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -29,7 +29,8 @@ import BaseDevice, {OS} from '../../server/devices/BaseDevice';
 import Client from '../../Client';
 import {State} from '../../reducers';
 import {brandColors, brandIcons, colors} from '../../ui/components/colors';
-import TroubleshootingGuide from './fb-stubs/TroubleshootingGuide';
+import {TroubleshootingGuide} from './fb-stubs/TroubleshootingGuide';
+import GK from '../../fb-stubs/GK';
 
 const {Text} = Typography;
 
@@ -108,7 +109,8 @@ export function AppSelector() {
       </Dropdown>
     </Radio.Group>
   ) : (
-    <TroubleshootingGuide />
+    // GK check to decide if troubleshooting guide will be visible or not
+    <TroubleshootingGuide showGuide={GK.get('flipper_self_sufficiency')} />
   );
 }
 
diff --git a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
index f7e7ee642..0c624dd00 100644
--- a/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/fb-stubs/TroubleshootingGuide.tsx
@@ -10,6 +10,6 @@
 import React from 'react';
 import {NoDevices} from '../NoDevices';
 
-export default function TroubleshootingGuide() {
+export function TroubleshootingGuide(_props: {showGuide: boolean}) {
   return <NoDevices />;
 }
diff --git a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideEndScreen.tsx b/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideEndScreen.tsx
deleted file mode 100644
index 9523e7273..000000000
--- a/desktop/app/src/sandy-chrome/appinspect/troubleshooting/GuideEndScreen.tsx
+++ /dev/null
@@ -1,63 +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 React from 'react';
-import {Button, Modal} from 'antd';
-import {Layout} from 'flipper-plugin';
-import {getInstance as getFormInstance} from '../../../fb-stubs/Logger';
-import {useDispatch} from '../../../utils/useStore';
-import {setStaticView} from '../../../reducers/connections';
-import SupportRequestFormV2 from '../../../fb-stubs/SupportRequestFormV2';
-import {Tracked} from 'flipper-plugin';
-
-export function GuideEndScreen(props: {
-  showModal: boolean;
-  toggleModal: (arg0: boolean) => void;
-}) {
-  const dispatch = useDispatch();
-  const problemSolved = () => {
-    props.toggleModal(false);
-  };
-  const loadForm = () => {
-    getFormInstance().track('usage', 'support-form-source', {
-      source: 'sidebar',
-      group: undefined,
-    });
-    dispatch(setStaticView(SupportRequestFormV2));
-    problemSolved();
-  };
-
-  return (
-    <Modal
-      title="Has your problem been solved OR do you want to file a support request?"
-      visible={props.showModal}
-      width={650}
-      footer={null}
-      onCancel={() => props.toggleModal(false)}
-      bodyStyle={{maxHeight: 800, overflow: 'auto'}}>
-      <Layout.Horizontal gap="huge">
-        <Tracked>
-          <Button
-            type="primary"
-            style={{flex: 1, marginBottom: 18}}
-            onClick={problemSolved}>
-            Problem Solved
-          </Button>
-        </Tracked>
-      </Layout.Horizontal>
-      <Layout.Horizontal gap="huge">
-        <Tracked>
-          <Button type="primary" style={{flex: 1}} onClick={loadForm}>
-            File Support Request
-          </Button>
-        </Tracked>
-      </Layout.Horizontal>
-    </Modal>
-  );
-}