diff --git a/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift b/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
index 5728475c..2499caa9 100644
--- a/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
+++ b/Passepartout-iOS/Scenes/Organizer/OrganizerViewController.swift
@@ -56,9 +56,7 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
             model.add(.siri)
         }
         model.add(.support)
-        if ProductManager.shared.isEligibleForFeedback() {
-            model.add(.feedback)
-        }
+        model.add(.feedback)
         model.add(.about)
         model.add(.destruction)
         model.setHeader(L10n.App.Service.Sections.Vpn.header, forSection: .vpn)
@@ -75,7 +73,13 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
         model.setHeader(L10n.Core.Organizer.Sections.Feedback.header, forSection: .feedback)
         model.set([.connectionStatus], forSection: .vpn)
         model.set([.donate, .translate], forSection: .support)
-        model.set([.joinCommunity, .writeReview], forSection: .feedback)
+
+        var feedbackRows: [RowType] = [.joinCommunity]
+        if ProductManager.shared.isEligibleForFeedback() {
+            feedbackRows.append(.writeReview)
+        }
+        model.set(feedbackRows, forSection: .feedback)
+
         model.set([.openAbout], forSection: .about)
         model.set([.uninstall], forSection: .destruction)
         if AppConstants.Flags.isBeta {
diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index 8afea3b6..4f64607e 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -1176,9 +1176,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
             model.add(.trusted)
             model.add(.trustedPolicy)
             model.add(.diagnostics)
-            if ProductManager.shared.isEligibleForFeedback() {
-                model.add(.feedback)
-            }
+            model.add(.feedback)
         }
 
         // headers
@@ -1233,7 +1231,12 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
             model.set([.vpnSurvivesSleep], forSection: .vpnSurvivesSleep)
             model.set([.trustedPolicy], forSection: .trustedPolicy)
             model.set([.dataCount, .serverConfiguration, .serverNetwork, .debugLog, .masksPrivateData], forSection: .diagnostics)
-            model.set([.faq, .reportIssue], forSection: .feedback)
+
+            var feedbackRows: [RowType] = [.faq]
+            if ProductManager.shared.isEligibleForFeedback() {
+                feedbackRows.append(.reportIssue)
+            }
+            model.set(feedbackRows, forSection: .feedback)
         }
 
         trustedNetworks.delegate = self