diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml
index b69bd67ab16..6bee5947447 100644
--- a/res/layout/private_dns_mode_dialog.xml
+++ b/res/layout/private_dns_mode_dialog.xml
@@ -77,10 +77,6 @@
                 android:id="@+id/private_dns_mode_quad9_unsecured_ecs"
                 layout="@layout/preference_widget_dialog_radiobutton"/>
 
-            <include
-                android:id="@+id/private_dns_mode_comss"
-                layout="@layout/preference_widget_dialog_radiobutton"/>
-
             <include
                 android:id="@+id/private_dns_mode_opportunistic"
                 layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index ef8a3720eaa..704b1e5ecac 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -73,11 +73,6 @@
     <!-- Quad9 Unsecured ECS DNS hostname -->
     <string name="private_dns_hostname_quad9_unsecured_ecs" translatable="false">dns12.quad9.net</string>
 
-    <!-- Comss DNS Option -->
-    <string name="private_dns_mode_comss" translatable="false">Comss DNS</string> 
-    <!-- Comss DNS hostname -->
-    <string name="private_dns_hostname_comss" translatable="false">dns.comss.one</string>
-
     <!-- Per-app volume -->
     <string name="app_volume">App volume</string>
     <string name="app_volume_title">Per-app volume control</string>
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 7c6434eb447..594e1d0c553 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -82,7 +82,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
     private static final int PRIVATE_DNS_MODE_QUAD9_UNSECURED = 11;
     private static final int PRIVATE_DNS_MODE_QUAD9_ECS = 12;
     private static final int PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS = 13;
-    private static final int PRIVATE_DNS_MODE_COMSS = 14;
 
     static {
         PRIVATE_DNS_MAP = new HashMap<>();
@@ -97,7 +96,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
         PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_QUAD9_UNSECURED, R.id.private_dns_mode_quad9_unsecured);
         PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_QUAD9_ECS, R.id.private_dns_mode_quad9_ecs);
         PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS, R.id.private_dns_mode_quad9_unsecured_ecs);
-        PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_COMSS, R.id.private_dns_mode_comss);
         PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_OPPORTUNISTIC, R.id.private_dns_mode_opportunistic);
         PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
     }
@@ -183,8 +181,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
                     context.getString(R.string.private_dns_hostname_quad9_ecs);
             final String quad9unsecuredecsHostname =
                     context.getString(R.string.private_dns_hostname_quad9_unsecured_ecs);
-            final String comssHostname =
-                    context.getString(R.string.private_dns_hostname_comss);
             if (privateDnsHostname.equals(cloudflareHostname)) {
                 mMode = PRIVATE_DNS_MODE_CLOUDFLARE;
             } else if (privateDnsHostname.equals(cloudflareblockmalwareHostname)) {
@@ -205,8 +201,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
                 mMode = PRIVATE_DNS_MODE_QUAD9_ECS;
             } else if (privateDnsHostname.equals(quad9unsecuredecsHostname)) {
                 mMode = PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS;
-            } else if (privateDnsHostname.equals(comssHostname)) {
-                mMode = PRIVATE_DNS_MODE_COMSS;
             }
         }
         mRadioGroup = view.findViewById(R.id.private_dns_radio_group);
@@ -246,9 +240,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
         final RadioButton quad9unsecuredecsRadioButton =
                 view.findViewById(R.id.private_dns_mode_quad9_unsecured_ecs);
         quad9unsecuredecsRadioButton.setText(R.string.private_dns_mode_quad9_unsecured_ecs);
-        final RadioButton comssRadioButton =
-                view.findViewById(R.id.private_dns_mode_comss);
-        comssRadioButton.setText(R.string.private_dns_mode_comss);
         final RadioButton opportunisticRadioButton =
                 view.findViewById(R.id.private_dns_mode_opportunistic);
         opportunisticRadioButton.setText(
@@ -304,8 +295,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
             mMode = PRIVATE_DNS_MODE_QUAD9_ECS;
         } else if (checkedId == R.id.private_dns_mode_quad9_unsecured_ecs) {
             mMode = PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS;
-        } else if (checkedId == R.id.private_dns_mode_comss) {
-            mMode = PRIVATE_DNS_MODE_COMSS;
         } else if (checkedId == R.id.private_dns_mode_opportunistic) {
             mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
         } else if (checkedId == R.id.private_dns_mode_provider) {
@@ -446,11 +435,6 @@ public class PrivateDnsModeDialogPreference extends CustomDialogPreferenceCompat
                     context.getString(R.string.private_dns_hostname_quad9_unsecured_ecs);
             ConnectivitySettingsManager.setPrivateDnsHostname(context, quad9unsecuredecsHostname);
             modeToSet = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
-        } else if (mMode == PRIVATE_DNS_MODE_COMSS) {
-            final String comssHostname =
-                    context.getString(R.string.private_dns_hostname_comss);
-            ConnectivitySettingsManager.setPrivateDnsHostname(context, comssHostname);
-            modeToSet = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
         }
 
         ConnectivitySettingsManager.setPrivateDnsMode(context, modeToSet);
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index d3dad51240b..3bbf0a3d19e 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -77,7 +77,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
     private static final int PRIVATE_DNS_MODE_QUAD9_UNSECURED = 11;
     private static final int PRIVATE_DNS_MODE_QUAD9_ECS = 12;
     private static final int PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS = 13;
-    private static final int PRIVATE_DNS_MODE_COMSS = 14;
 
     private final Handler mHandler;
     private final ContentObserver mSettingsObserver;
@@ -155,7 +154,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
             case PRIVATE_DNS_MODE_QUAD9_UNSECURED:
             case PRIVATE_DNS_MODE_QUAD9_ECS:
             case PRIVATE_DNS_MODE_QUAD9_UNSECURED_ECS:
-            case PRIVATE_DNS_MODE_COMSS:
             case PRIVATE_DNS_MODE_OPPORTUNISTIC:
                 return dnsesResolved ? res.getString(R.string.private_dns_mode_on)
                         : res.getString(
@@ -187,8 +185,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
                         res.getString(R.string.private_dns_hostname_quad9_ecs);
                 final String quad9unsecuredecsHostname =
                         res.getString(R.string.private_dns_hostname_quad9_unsecured_ecs);
-                final String comssHostname =
-                        res.getString(R.string.private_dns_hostname_comss);
                 if (privateDnsHostname.equals(cloudflareHostname)) {
                     return res.getString(R.string.private_dns_mode_cloudflare);
                 } else if (privateDnsHostname.equals(adguardHostname)) {
@@ -199,8 +195,6 @@ public class PrivateDnsPreferenceController extends BasePreferenceController
                     return res.getString(R.string.private_dns_mode_cleanbrowsing);
                 } else if (privateDnsHostname.equals(quad9Hostname)) {
                     return res.getString(R.string.private_dns_mode_quad9);
-                } else if (privateDnsHostname.equals(comssHostname)) {
-                    return res.getString(R.string.private_dns_mode_comss);
                 }
                 return privateDnsHostname;
         }