diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java
index 7b485f7d..ebd10715 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java
@@ -17,10 +17,8 @@
 package org.lineageos.platform.internal;
 
 import android.content.Context;
-import android.os.SystemProperties;
 
 import lineageos.app.LineageContextConstants;
-import lineageos.providers.LineageSettings;
 
 /** @hide */
 public class LineageSettingsService extends LineageSystemService {
@@ -41,14 +39,6 @@ public class LineageSettingsService extends LineageSystemService {
 
     @Override
     public void onBootPhase(int phase) {
-        if (phase == PHASE_BOOT_COMPLETED) {
-            // Load custom hostname
-            String hostname = LineageSettings.Secure.getString(mContext.getContentResolver(),
-                    LineageSettings.Secure.DEVICE_HOSTNAME);
-            if (hostname != null) {
-                SystemProperties.set("net.hostname", hostname);
-            }
-        }
     }
 
     @Override
diff --git a/sdk/src/java/lineageos/providers/LineageSettings.java b/sdk/src/java/lineageos/providers/LineageSettings.java
index 47a59067..bb75c1b5 100644
--- a/sdk/src/java/lineageos/providers/LineageSettings.java
+++ b/sdk/src/java/lineageos/providers/LineageSettings.java
@@ -3001,8 +3001,10 @@ public final class LineageSettings {
 
         /**
          * The hostname for this device
+         * @deprecated
          * @hide
          */
+        @Deprecated
         public static final String DEVICE_HOSTNAME = "device_hostname";
 
         /**