diff --git a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
index 1070db4e57..001980b5b5 100644
--- a/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
@@ -346,10 +346,11 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
                 self.showInviteFriends(from: self.avatarMenuButton)
             })
         }
-
-        subMenuActions.append(UIAction(title: VectorL10n.sideMenuActionFeedback, image: UIImage(systemName: "questionmark.circle")) { [weak self] action in
-            self?.showBugReport()
-        })
+        if BuildSettings.allowBugReportingAndFeedbackManually {
+            subMenuActions.append(UIAction(title: VectorL10n.sideMenuActionFeedback, image: UIImage(systemName: "questionmark.circle")) { [weak self] action in
+                self?.showBugReport()
+            })
+        }
         
         actions.append(UIMenu(title: "", options: .displayInline, children: subMenuActions))
         actions.append(UIMenu(title: "", options: .displayInline, children: [
diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 54bb95d34e..88bc85c4e5 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -554,7 +554,7 @@ - (void)updateSections
     }
     [sectionAdvanced addRowWithTag:ADVANCED_MARK_ALL_AS_READ_INDEX];
     [sectionAdvanced addRowWithTag:ADVANCED_CLEAR_CACHE_INDEX];
-    if (BuildSettings.settingsScreenAllowBugReportingManually)
+    if (BuildSettings.allowBugReportingAndFeedbackManually)
     {
         [sectionAdvanced addRowWithTag:ADVANCED_REPORT_BUG_INDEX];
     }
diff --git a/Riot/Modules/SideMenu/SideMenuViewModel.swift b/Riot/Modules/SideMenu/SideMenuViewModel.swift
index 0b0b84862e..2cf86f47f8 100644
--- a/Riot/Modules/SideMenu/SideMenuViewModel.swift
+++ b/Riot/Modules/SideMenu/SideMenuViewModel.swift
@@ -106,10 +106,13 @@ final class SideMenuViewModel: SideMenuViewModelType {
         }
         
         sideMenuItems += [
-            .settings,
-            .feedback
+            .settings
         ]
         
+        if BuildSettings.allowBugReportingAndFeedbackManually {
+            sideMenuItems += [.feedback]
+        }
+        
         // Hide app version
         let appVersion: String? = nil
         
diff --git a/changelog.d/7102.change b/changelog.d/7102.change
new file mode 100644
index 0000000000..931562c1cc
--- /dev/null
+++ b/changelog.d/7102.change
@@ -0,0 +1 @@
+Add BuildSetting to hide feedback in the side-menu