diff --git a/src/main/java/net/minestom/server/extensions/ExtensionManager.java b/src/main/java/net/minestom/server/extensions/ExtensionManager.java
index dfb9be46b..d664544c8 100644
--- a/src/main/java/net/minestom/server/extensions/ExtensionManager.java
+++ b/src/main/java/net/minestom/server/extensions/ExtensionManager.java
@@ -5,7 +5,6 @@ import net.minestom.dependencies.DependencyGetter;
 import net.minestom.dependencies.ResolvedDependency;
 import net.minestom.dependencies.maven.MavenRepository;
 import net.minestom.server.ServerProcess;
-import net.minestom.server.utils.PropertyUtils;
 import net.minestom.server.utils.validate.Check;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -37,7 +36,7 @@ public class ExtensionManager {
     private final Map<String, Extension> extensions = new LinkedHashMap<>();
     private final Map<String, Extension> immutableExtensions = Collections.unmodifiableMap(extensions);
 
-    private final File extensionFolder = new File(PropertyUtils.getString("minestom.extension.folder", "extensions"));
+    private final File extensionFolder = new File(System.getProperty("minestom.extension.folder", "extensions"));
     private final File dependenciesFolder = new File(extensionFolder, ".libs");
     private Path extensionDataRoot = extensionFolder.toPath();
 
diff --git a/src/main/java/net/minestom/server/instance/WorldBorder.java b/src/main/java/net/minestom/server/instance/WorldBorder.java
index 839070d20..06e11b637 100644
--- a/src/main/java/net/minestom/server/instance/WorldBorder.java
+++ b/src/main/java/net/minestom/server/instance/WorldBorder.java
@@ -27,7 +27,7 @@ public class WorldBorder {
     private long lerpStartTime;
 
     private long speed;
-    private int portalTeleportBoundary;
+    private final int portalTeleportBoundary;
     private int warningTime;
     private int warningBlocks;
 
@@ -39,8 +39,7 @@ public class WorldBorder {
 
         this.speed = 0;
 
-        this.portalTeleportBoundary = 29999984;
-
+        this.portalTeleportBoundary = Integer.getInteger("minestom.world-border-size", 29999984);
     }
 
     /**
diff --git a/src/main/java/net/minestom/server/utils/PropertyUtils.java b/src/main/java/net/minestom/server/utils/PropertyUtils.java
index ec7c15e9b..62d82f286 100644
--- a/src/main/java/net/minestom/server/utils/PropertyUtils.java
+++ b/src/main/java/net/minestom/server/utils/PropertyUtils.java
@@ -21,12 +21,6 @@ public final class PropertyUtils {
 
     @Contract("_, null -> null; _, !null -> !null")
     public static String getString(@NotNull String name, @Nullable String defaultValue) {
-        final String value = System.getProperty(name);
-
-        if (value == null) {
-            return defaultValue;
-        } else {
-            return value;
-        }
+        return System.getProperty(name, defaultValue);
     }
 }