diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f3d29c3c9a..efdfc14a87 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -11125,6 +11125,17 @@ class FSObjectExportCollada : public view_listener_t
 };
 // </FS:CR>
 
+// <FS:Ansariel> Discord integration
+bool enable_discord_integration()
+{
+#if HAS_DISCORD
+	return true;
+#else
+	return false;
+#endif
+}
+// </FS:Ansariel>
+
 // <FS:Zi> Make sure to call this before any of the UI is set up, so all text editors can
 //         pick up the menu properly.
 void initialize_edit_menu()
@@ -11843,4 +11854,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new FSObjectExportCollada(), "Object.ExportCollada");
 	enable.add("Object.EnableExport", boost::bind(&enable_export_object));
 	// </FS:Techwolf Lupindo>
+
+	// <FS:Ansariel> Discord integration
+	enable.add("FSDiscordEnabled", std::bind(&enable_discord_integration));
 }
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a1607bd5f3..a91a98ef6e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -604,6 +604,8 @@
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="fs_discord"/>
+        <menu_item_call.on_visible
+          function="FSDiscordEnabled"/>
       </menu_item_call>
         <menu_item_separator/>
         <menu