diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661c7a7fb..fd0dc9b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 * Fix file sharing to certain apps (e.g. Material Files, etc.)
+* Remove proxy toggle from profile editing to avoid confusion
 
 ## v2.48.0
 2026-03
diff --git a/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java b/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
index e14de1d2f..072cb95f3 100644
--- a/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/relay/EditRelayActivity.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.relay;
 
-import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED;
 import static org.thoughtcrime.securesms.connect.DcHelper.getContext;
 
 import android.content.DialogInterface;
@@ -24,7 +23,6 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.SwitchCompat;
 import androidx.constraintlayout.widget.Group;
 import chat.delta.rpc.Rpc;
 import chat.delta.rpc.RpcException;
@@ -44,7 +42,6 @@ import org.thoughtcrime.securesms.WelcomeActivity;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
 import org.thoughtcrime.securesms.util.IntentUtils;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -79,8 +76,6 @@ public class EditRelayActivity extends BaseActionBarActivity
   Spinner smtpSecurity;
   Spinner certCheck;
 
-  private SwitchCompat proxySwitch;
-
   Rpc rpc;
   int accId;
 
@@ -116,13 +111,6 @@ public class EditRelayActivity extends BaseActionBarActivity
     smtpSecurity = findViewById(R.id.smtp_security);
     certCheck = findViewById(R.id.cert_check);
 
-    proxySwitch = findViewById(R.id.proxy_settings);
-    proxySwitch.setOnClickListener(
-        l -> {
-          proxySwitch.setChecked(!proxySwitch.isChecked()); // revert toggle
-          startActivity(new Intent(this, ProxySettingsActivity.class));
-        });
-
     String addr = getIntent().getStringExtra(EXTRA_ADDR);
     EnteredLoginParam config = null;
     try {
@@ -185,10 +173,6 @@ public class EditRelayActivity extends BaseActionBarActivity
     boolean expandAdvanced = false;
     int intVal;
 
-    intVal = DcHelper.getInt(this, CONFIG_PROXY_ENABLED);
-    proxySwitch.setChecked(intVal == 1);
-    expandAdvanced = expandAdvanced || intVal == 1;
-
     if (config != null) { // configured
       emailInput.setText(config.addr);
       if (!TextUtils.isEmpty(config.addr)) {
@@ -246,7 +230,6 @@ public class EditRelayActivity extends BaseActionBarActivity
   @Override
   public void onResume() {
     super.onResume();
-    proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
   }
 
   private void showLog() {
diff --git a/src/main/res/layout/activity_edittransport.xml b/src/main/res/layout/activity_edittransport.xml
index 89a4eaa46..5bb29d8e4 100644
--- a/src/main/res/layout/activity_edittransport.xml
+++ b/src/main/res/layout/activity_edittransport.xml
@@ -129,7 +129,7 @@
                 android:visibility="gone"
                 tools:visibility="visible"
                 app:constraint_referenced_ids="inbox, imap_login, imap_server, imap_port, imap_security_label, imap_security, outbox_view_spacer_top,
-            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, cert_check_label, cert_check, view_log_button, proxy_settings" />
+            outbox, smtp_login, smtp_password, smtp_server, smtp_port, smtp_security_label, smtp_security, cert_check_label, cert_check, view_log_button" />
 
             <ImageView
                 android:id="@+id/advanced_icon"
@@ -157,17 +157,6 @@
                 app:layout_constraintStart_toEndOf="@id/advanced_icon"
                 app:layout_constraintTop_toBottomOf="@id/no_servers_hint" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/proxy_settings"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:text="@string/proxy_use_proxy"
-                app:layout_constraintEnd_toEndOf="@id/guideline_root_end"
-                app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-                app:layout_constraintTop_toBottomOf="@id/advanced_text" />
-
             <TextView
                 android:id="@+id/inbox"
                 android:layout_width="wrap_content"
@@ -176,7 +165,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/login_inbox"
                 app:layout_constraintStart_toStartOf="@id/guideline_root_start"
-                app:layout_constraintTop_toBottomOf="@id/proxy_settings" />
+                app:layout_constraintTop_toBottomOf="@id/advanced_text" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/imap_login"