diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 24b20f1208..2cd7d0d114 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -920,8 +920,17 @@ public final class CraftServer implements Server {
         return result;
     }
 
+    public void removeBukkitSpawnRadius() {
+        configuration.set("settings.spawn-radius", null);
+        saveConfig();
+    }
+
+    public int getBukkitSpawnRadius() {
+        return configuration.getInt("settings.spawn-radius", -1);
+    }
+
     public int getSpawnRadius() {
-        return configuration.getInt("settings.spawn-radius", 16);
+        return ((DedicatedServer) console).propertyManager.getInt("spawn-protection", 16);
     }
 
     public void setSpawnRadius(int value) {
diff --git a/paper-server/src/main/resources/configurations/bukkit.yml b/paper-server/src/main/resources/configurations/bukkit.yml
index b34d84f0ac..2f587dd280 100644
--- a/paper-server/src/main/resources/configurations/bukkit.yml
+++ b/paper-server/src/main/resources/configurations/bukkit.yml
@@ -16,7 +16,6 @@
 settings:
     allow-end: true
     warn-on-overload: true
-    spawn-radius: 16
     permissions-file: permissions.yml
     update-folder: update
     ping-packet-limit: 100