diff --git a/docker/config.ini b/docker/config.ini
index 8453c7d7..0a5e6567 100644
--- a/docker/config.ini
+++ b/docker/config.ini
@@ -29,6 +29,7 @@ rpc_host=0.0.0.0
 rpc_port=8994
 
 [webadmin]
+enabled=true
 host=0.0.0.0
 port=5000
 
diff --git a/itests/config.ini b/itests/config.ini
index 7148a3fc..c190b3c5 100644
--- a/itests/config.ini
+++ b/itests/config.ini
@@ -28,6 +28,9 @@ rpc_port=8774
 rpc_host=0.0.0.0
 rpc_port=8994
 
+[webadmin]
+enabled=false
+
 [postgresql]
 host=db
 database=squeakserver
diff --git a/squeakserver/main.py b/squeakserver/main.py
index 3bea8d97..c7b87fba 100644
--- a/squeakserver/main.py
+++ b/squeakserver/main.py
@@ -152,6 +152,10 @@ def start_admin_rpc_server(rpc_server):
     thread.start()
 
 
+def load_admin_web_server_enabled(config):
+    return config["webadmin"].getboolean("enabled")
+
+
 def start_admin_web_server(admin_web_server):
     logger.info("Calling start_admin_web_server...")
     thread = threading.Thread(
@@ -251,8 +255,10 @@ def run_server(config):
     start_admin_rpc_server(admin_rpc_server)
 
     # start admin web server
-    admin_web_server = load_admin_web_server(config, admin_handler)
-    start_admin_web_server(admin_web_server)
+    admin_web_server_enabled = load_admin_web_server_enabled(config)
+    if admin_web_server_enabled:
+        admin_web_server = load_admin_web_server(config, admin_handler)
+        start_admin_web_server(admin_web_server)
 
     # start rpc server
     handler = load_handler(squeak_node)