diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index bcbb4441..4f2eae64 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -76,7 +76,9 @@ public class DynmapPlugin extends JavaPlugin {
         mapManager = new MapManager(this, configuration);
         mapManager.startRendering();
 
-        loadWebserver();
+        if (!configuration.getBoolean("disable-webserver", false)) {
+            loadWebserver();
+        }
 
         if (configuration.getBoolean("jsonfile", false)) {
             jsonConfig();