diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
index 5ad588c7a..972ba6900 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java
@@ -212,11 +212,6 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap
         return getServer().getVersion() + " - " + getServer().getBukkitVersion();
     }
 
-    @Override
-    public String getServerName() {
-        return getServer().getServerName();
-    }
-
     @Override
     public Path getDataDirectory() {
         return getDataFolder().toPath().toAbsolutePath();
diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
index b9e4d4f50..c1622e1a1 100644
--- a/bukkit/src/main/resources/config.yml
+++ b/bukkit/src/main/resources/config.yml
@@ -556,10 +556,6 @@ vault-debug: false
 # - Useful if you're having issues with UUID forwarding or data not being loaded.
 debug-logins: false
 
-# If LuckPerms should use the "server-name" property from the "server.properties" file as the
-# "server" option within LuckPerms.
-use-server-properties-name: false
-
 # If LuckPerms should allow usernames with non alphanumeric characters.
 #
 # - Note that due to the design of the storage implementation, usernames must still be 16 characters
diff --git a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
index b98b3bcd1..bff4ff89f 100644
--- a/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
+++ b/common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
@@ -76,16 +76,7 @@ public final class ConfigKeys {
     /**
      * The name of the server
      */
-    public static final ConfigKey<String> SERVER = customKey(c -> {
-        if (c.getBoolean("use-server-properties-name", false)) {
-            String serverName = c.getPlugin().getBootstrap().getServerName();
-            if (serverName != null && !serverName.equals("Unknown Server")) {
-                return serverName.toLowerCase();
-            }
-        }
-
-        return c.getString("server", "global").toLowerCase();
-    });
+    public static final ConfigKey<String> SERVER = lowercaseStringKey("server", "global");
 
     /**
      * How many minutes to wait between syncs. A value <= 0 will disable syncing.
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java
index f24f32220..719958706 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/LPNukkitBootstrap.java
@@ -168,11 +168,6 @@ public class LPNukkitBootstrap extends PluginBase implements LuckPermsBootstrap
         return getServer().getVersion() + " - " + getServer().getNukkitVersion();
     }
 
-    @Override
-    public String getServerName() {
-        return getServer().getServerUniqueId().toString();
-    }
-
     @Override
     public Path getDataDirectory() {
         return getDataFolder().toPath().toAbsolutePath();