diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index e01960a71598c..b68150c41418d 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1153,13 +1153,8 @@ public boolean startAlwaysOnVpn() {
             if (alwaysOnPackage == null) {
                 return true;
             }
-            // Remove always-on VPN if it's not supported.
             if (!isAlwaysOnPackageSupported(alwaysOnPackage)) {
-                // Do not remove the always-on setting due to the restricted ability in safe mode.
-                // The always-on VPN can then start after the device reboots to normal mode.
-                if (!mContext.getPackageManager().isSafeMode()) {
-                    setAlwaysOnPackage(null, false, null);
-                }
+                Log.i(TAG, "startAlwaysOnVpn: isAlwaysOnPackageSupported returned false for " + alwaysOnPackage, new Throwable());
                 return false;
             }
             // Skip if the service is already established. This isn't bulletproof: it's not bound