diff --git a/papur-addon/config.yaml b/papur-addon/config.yaml
index 320011a..0ce4c1f 100644
--- a/papur-addon/config.yaml
+++ b/papur-addon/config.yaml
@@ -31,6 +31,9 @@ options:
   gateway_port: 18789
   gateway_token: ""
 
+  # Run `clawdbot doctor --fix` on startup (useful after upgrades; slows restarts)
+  run_doctor_on_start: false
+
   homeassistant_token: ""
   mikrotik_host: "192.168.88.1"
   mikrotik_ssh_user: "papur"
@@ -44,6 +47,7 @@ schema:
   gateway_bind: list(loopback|lan)
   gateway_port: int
   gateway_token: str?
+  run_doctor_on_start: bool
   homeassistant_token: str?
   mikrotik_host: str
   mikrotik_ssh_user: str
diff --git a/papur-addon/run.sh b/papur-addon/run.sh
index 16a9343..53d13b3 100644
--- a/papur-addon/run.sh
+++ b/papur-addon/run.sh
@@ -126,10 +126,16 @@ MikroTik SSH:
   key=${MT_KEY}
 EOF
 
-echo "Running clawdbot doctor (auto-fix) ..."
-# Doctor is idempotent; but in containers it can occasionally hang on environment checks.
-# Put a hard timeout so the gateway still starts.
-(timeout 60s clawdbot doctor --fix --yes) || true
+RUN_DOCTOR=$(jq -r '.run_doctor_on_start // false' "$OPTIONS_FILE")
+
+if [ "$RUN_DOCTOR" = "true" ]; then
+  echo "Running clawdbot doctor (auto-fix) ..."
+  # Doctor is idempotent; but in containers it can occasionally hang on environment checks.
+  # Put a hard timeout so the gateway still starts.
+  (timeout 60s clawdbot doctor --fix --yes) || true
+else
+  echo "Skipping clawdbot doctor on startup (run_doctor_on_start=false)"
+fi
 
 echo "Starting Clawdbot Gateway..."
 exec clawdbot gateway run