diff --git a/cmd/picoclaw/internal/helpers.go b/cmd/picoclaw/internal/helpers.go
index ae1d58c29..0f45e7425 100644
--- a/cmd/picoclaw/internal/helpers.go
+++ b/cmd/picoclaw/internal/helpers.go
@@ -32,7 +32,7 @@ func LoadConfig() (*config.Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	logger.SetLevelFromString(cfg.Agents.Defaults.LogLevel)
+	logger.SetLevelFromString(cfg.Gateway.LogLevel)
 	return cfg, nil
 }
 
diff --git a/config/config.example.json b/config/config.example.json
index 29655b594..88578701a 100644
--- a/config/config.example.json
+++ b/config/config.example.json
@@ -1,7 +1,6 @@
 {
   "agents": {
     "defaults": {
-      "log_level": "fatal",
       "workspace": "~/.picoclaw/workspace",
       "restrict_to_workspace": true,
       "model_name": "gpt-5.4",
@@ -560,8 +559,10 @@
     }
   },
   "gateway": {
+    "_comment": "Default log level is set to 'fatal'. Other available options are 'debug', 'info', 'warn' and 'error'.",
     "host": "127.0.0.1",
     "port": 18790,
-    "hot_reload": false
+    "hot_reload": false,
+    "log_level": "fatal"
   }
 }
diff --git a/pkg/config/config.go b/pkg/config/config.go
index cbed31ded..070e8e499 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -285,7 +285,6 @@ type AgentDefaults struct {
 	SteeringMode              string             `json:"steering_mode,omitempty"         env:"PICOCLAW_AGENTS_DEFAULTS_STEERING_MODE"` // "one-at-a-time" (default) or "all"
 	SubTurn                   SubTurnConfig      `json:"subturn"                                                                                     envPrefix:"PICOCLAW_AGENTS_DEFAULTS_SUBTURN_"`
 	ToolFeedback              ToolFeedbackConfig `json:"tool_feedback,omitempty"`
-	LogLevel                  string             `json:"log_level,omitempty"             env:"PICOCLAW_LOG_LEVEL"`
 }
 
 const (
@@ -733,9 +732,10 @@ func (c *ModelConfig) Validate() error {
 }
 
 type GatewayConfig struct {
-	Host      string `json:"host"       env:"PICOCLAW_GATEWAY_HOST"`
-	Port      int    `json:"port"       env:"PICOCLAW_GATEWAY_PORT"`
-	HotReload bool   `json:"hot_reload" env:"PICOCLAW_GATEWAY_HOT_RELOAD"`
+	Host      string `json:"host"                env:"PICOCLAW_GATEWAY_HOST"`
+	Port      int    `json:"port"                env:"PICOCLAW_GATEWAY_PORT"`
+	HotReload bool   `json:"hot_reload"          env:"PICOCLAW_GATEWAY_HOT_RELOAD"`
+	LogLevel  string `json:"log_level,omitempty" env:"PICOCLAW_LOG_LEVEL"`
 }
 
 type ToolDiscoveryConfig struct {
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 88ab1ed51..f1e94afbc 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -488,8 +488,8 @@ func TestDefaultConfig_HooksDefaults(t *testing.T) {
 
 func TestDefaultConfig_LogLevel(t *testing.T) {
 	cfg := DefaultConfig()
-	if cfg.Agents.Defaults.LogLevel != "fatal" {
-		t.Errorf("LogLevel = %q, want \"fatal\"", cfg.Agents.Defaults.LogLevel)
+	if cfg.Gateway.LogLevel != "fatal" {
+		t.Errorf("LogLevel = %q, want \"fatal\"", cfg.Gateway.LogLevel)
 	}
 }
 
@@ -1166,7 +1166,7 @@ func TestLoadConfig_UsesPassphraseProvider(t *testing.T) {
 func TestConfigParsesLogLevel(t *testing.T) {
 	dir := t.TempDir()
 	cfgPath := filepath.Join(dir, "config.json")
-	data := `{"agents":{"defaults":{"log_level":"debug"}}}`
+	data := `{"gateway":{"log_level":"debug"}}`
 	if err := os.WriteFile(cfgPath, []byte(data), 0o600); err != nil {
 		t.Fatalf("setup: %v", err)
 	}
@@ -1175,8 +1175,8 @@ func TestConfigParsesLogLevel(t *testing.T) {
 	if err != nil {
 		t.Fatalf("LoadConfig: %v", err)
 	}
-	if cfg.Agents.Defaults.LogLevel != "debug" {
-		t.Errorf("LogLevel = %q, want \"debug\"", cfg.Agents.Defaults.LogLevel)
+	if cfg.Gateway.LogLevel != "debug" {
+		t.Errorf("LogLevel = %q, want \"debug\"", cfg.Gateway.LogLevel)
 	}
 }
 
@@ -1193,7 +1193,7 @@ func TestConfigLogLevelEmpty(t *testing.T) {
 		t.Fatalf("LoadConfig: %v", err)
 	}
 	// When config omits log_level, the DefaultConfig value ("fatal") is preserved.
-	if cfg.Agents.Defaults.LogLevel != "fatal" {
-		t.Errorf("LogLevel = %q, want \"fatal\"", cfg.Agents.Defaults.LogLevel)
+	if cfg.Gateway.LogLevel != "fatal" {
+		t.Errorf("LogLevel = %q, want \"fatal\"", cfg.Gateway.LogLevel)
 	}
 }
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index 2ec2b249d..7c47c8474 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -26,7 +26,6 @@ func DefaultConfig() *Config {
 	return &Config{
 		Agents: AgentsConfig{
 			Defaults: AgentDefaults{
-				LogLevel:                  "fatal",
 				Workspace:                 workspacePath,
 				RestrictToWorkspace:       true,
 				Provider:                  "",
@@ -424,6 +423,7 @@ func DefaultConfig() *Config {
 			Host:      "127.0.0.1",
 			Port:      18790,
 			HotReload: false,
+			LogLevel:  "fatal",
 		},
 		Tools: ToolsConfig{
 			MediaCleanup: MediaCleanupConfig{
diff --git a/pkg/gateway/gateway.go b/pkg/gateway/gateway.go
index 92bef6c15..7f920a6f1 100644
--- a/pkg/gateway/gateway.go
+++ b/pkg/gateway/gateway.go
@@ -85,7 +85,7 @@ func Run(debug bool, configPath string, allowEmptyStartup bool) error {
 		return fmt.Errorf("error loading config: %w", err)
 	}
 
-	logger.SetLevelFromString(cfg.Agents.Defaults.LogLevel)
+	logger.SetLevelFromString(cfg.Gateway.LogLevel)
 
 	if debug {
 		logger.SetLevel(logger.DEBUG)