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 26551107..7b485f7d 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/LineageSettingsService.java
@@ -45,7 +45,9 @@ public class LineageSettingsService extends LineageSystemService {
             // Load custom hostname
             String hostname = LineageSettings.Secure.getString(mContext.getContentResolver(),
                     LineageSettings.Secure.DEVICE_HOSTNAME);
-            SystemProperties.set("net.hostname", hostname);
+            if (hostname != null) {
+                SystemProperties.set("net.hostname", hostname);
+            }
         }
     }