diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9dabfe56..60149bd39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,10 @@
 * data saving: do not send Autocrypt header in read receipts
 * improve onboarding speed
 * don't show badge counter in app icon for the permanent background notification
+* fix sorting of old media in gallery
 * remove deprecated "companion app" code
 * remove deprecated "Watch Sent Folder" preference
-* fix sorting of old media in gallery
+* remove deprecated "send self-report" preference
 * don't show email address in shared vcard
 * update to core 2.23.0
 
diff --git a/src/main/java/chat/delta/rpc/Rpc.java b/src/main/java/chat/delta/rpc/Rpc.java
index f157b8d22..7d57530f4 100644
--- a/src/main/java/chat/delta/rpc/Rpc.java
+++ b/src/main/java/chat/delta/rpc/Rpc.java
@@ -57,10 +57,6 @@ public class Rpc {
     return transport.callForResult(new TypeReference<String>(){}, "get_migration_error", mapper.valueToTree(accountId));
   }
 
-  public Integer draftSelfReport(Integer accountId) throws RpcException {
-    return transport.callForResult(new TypeReference<Integer>(){}, "draft_self_report", mapper.valueToTree(accountId));
-  }
-
   /* Returns configuration value for the given key. */
   public String getConfig(Integer accountId, String key) throws RpcException {
     return transport.callForResult(new TypeReference<String>(){}, "get_config", mapper.valueToTree(accountId), mapper.valueToTree(key));
diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index d11795e29..5e2c5887c 100644
--- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -210,24 +210,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment
       });
     }
 
-    Preference selfReporting = this.findPreference("pref_self_reporting");
-    if (selfReporting != null) {
-      selfReporting.setOnPreferenceClickListener(((preference) -> {
-        try {
-          int chatId = getRpc(requireActivity()).draftSelfReport(dcContext.getAccountId());
-
-          Intent intent = new Intent(requireActivity(), ConversationActivity.class);
-          intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId);
-          intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-          requireActivity().startActivity(intent);
-        } catch (RpcException e) {
-          Log.e(TAG, "Error calling rpc.draftSelfReport()", e);
-        }
-
-        return true;
-      }));
-    }
-
     Preference proxySettings = this.findPreference("proxy_settings_button");
     if (proxySettings != null) {
       proxySettings.setOnPreferenceClickListener((preference) -> {
diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml
index 3b54f5ecc..a9752b6f4 100644
--- a/src/main/res/xml/preferences_advanced.xml
+++ b/src/main/res/xml/preferences_advanced.xml
@@ -11,9 +11,6 @@
         android:summary="@string/enable_realtime_explain"
         android:title="@string/enable_realtime"/>
 
-    <Preference android:key="pref_self_reporting"
-        android:title="@string/send_stats_to_devs"/>
-
     <PreferenceCategory android:title="@string/pref_experimental_features">
 
         <Preference android:key="pref_webxdc_store_url"