diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24ab5cade..896f6cf3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+
+- Disabled the `authority-claimer` when `CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED` is set to `true`.
+
 ## [1.5.0] 2024-07-22
 
 ### Added
diff --git a/build/compose-node.yaml b/build/compose-node.yaml
index b157b4482..fc85e759d 100644
--- a/build/compose-node.yaml
+++ b/build/compose-node.yaml
@@ -17,3 +17,5 @@ services:
       CARTESI_FEATURE_DISABLE_CLAIMER: "false"
       CARTESI_HTTP_ADDRESS: "0.0.0.0"
       CARTESI_HTTP_PORT: "10000"
+      CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED: true
+      CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT: redis://default:VERY_SECRET_PASWORD@rollups-nodes-redis.internal:6379
diff --git a/docs/config.md b/docs/config.md
index a48b45f4e..ef139904e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -151,7 +151,7 @@ All other log configurations are ignored.
 
 ## `CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED`
 
-When enabled, the node does not start the authority-claimer service and the Redis server.
+When enabled, the node does not start the authority-claimer service, thus not making claims, and the Redis server.
 
 * **Type:** `bool`
 * **Default:** `"false"`
diff --git a/internal/node/config/config.go b/internal/node/config/config.go
index 6f9d6391d..f32a744b3 100644
--- a/internal/node/config/config.go
+++ b/internal/node/config/config.go
@@ -93,15 +93,16 @@ func FromEnv() NodeConfig {
 	config.HttpAddress = getHttpAddress()
 	config.HttpPort = getHttpPort()
 	config.FeatureHostMode = getFeatureHostMode()
-	config.FeatureDisableClaimer = getFeatureDisableClaimer()
 	config.FeatureDisableMachineHashCheck = getFeatureDisableMachineHashCheck()
 	config.ExperimentalServerManagerBypassLog = getExperimentalServerManagerBypassLog()
+	config.FeatureDisableClaimer = getFeatureDisableClaimer()
 	config.ExperimentalSunodoValidatorEnabled = getExperimentalSunodoValidatorEnabled()
-	if getExperimentalSunodoValidatorEnabled() {
+	if config.ExperimentalSunodoValidatorEnabled {
 		config.ExperimentalSunodoValidatorRedisEndpoint =
 			getExperimentalSunodoValidatorRedisEndpoint()
+		config.FeatureDisableClaimer = true
 	}
-	if !getFeatureDisableClaimer() && !getExperimentalSunodoValidatorEnabled() {
+	if !config.FeatureDisableClaimer && !getExperimentalSunodoValidatorEnabled() {
 		config.Auth = authFromEnv()
 	}
 	return config
diff --git a/internal/node/config/config_test.go b/internal/node/config/config_test.go
new file mode 100644
index 000000000..b1c95e08b
--- /dev/null
+++ b/internal/node/config/config_test.go
@@ -0,0 +1,45 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package config
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+)
+
+type ConfigTestSuite struct {
+	suite.Suite
+}
+
+func (s *ConfigTestSuite) SetupSuite() {
+	os.Setenv("CARTESI_BLOCKCHAIN_ID", "31337")
+	os.Setenv("CARTESI_BLOCKCHAIN_HTTP_ENDPOINT", "http://localhost:8545")
+	os.Setenv("CARTESI_BLOCKCHAIN_WS_ENDPOINT", "ws://localhost:8545")
+	os.Setenv("CARTESI_CONTRACTS_APPLICATION_ADDRESS", "0x")
+	os.Setenv("CARTESI_CONTRACTS_HISTORY_ADDRESS", "0x")
+	os.Setenv("CARTESI_CONTRACTS_AUTHORITY_ADDRESS", "0x")
+	os.Setenv("CARTESI_CONTRACTS_INPUT_BOX_ADDRESS", "0x")
+	os.Setenv("CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER", "0")
+	os.Setenv("CARTESI_SNAPSHOT_DIR", "/tmp")
+}
+
+func TestConfigTest(t *testing.T) {
+	suite.Run(t, new(ConfigTestSuite))
+}
+
+func (s *ConfigTestSuite) TestExperimentalSunodoValidatorModeDisablesClaimer() {
+	os.Setenv("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED", "true")
+	os.Setenv("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT", "redis://")
+	c := FromEnv()
+	assert.Equal(s.T(), true, c.FeatureDisableClaimer)
+}
+
+func (s *ConfigTestSuite) TestAuthIsNotSetWhenClaimerIsDisabled() {
+	os.Setenv("CARTESI_FEATURE_DISABLE_CLAIMER", "true")
+	c := FromEnv()
+	assert.Nil(s.T(), c.Auth)
+}
diff --git a/internal/node/config/generate/Config.toml b/internal/node/config/generate/Config.toml
index bda385b6c..b0e42fbd0 100644
--- a/internal/node/config/generate/Config.toml
+++ b/internal/node/config/generate/Config.toml
@@ -225,7 +225,7 @@ The node will also use the 20 ports after this one for internal services."""
 default = "false"
 go-type = "bool"
 description = """
-When enabled, the node does not start the authority-claimer service and the Redis server."""
+When enabled, the node does not start the authority-claimer service, thus not making claims, and the Redis server."""
 
 [experimental.CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT]
 go-type = "string"