diff --git a/charger/ocpp/cp_setup.go b/charger/ocpp/cp_setup.go
index f859023629..44488d4aa1 100644
--- a/charger/ocpp/cp_setup.go
+++ b/charger/ocpp/cp_setup.go
@@ -125,11 +125,10 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
 
 	// configure measurands
 	if meterValues != "" {
-		if err := cp.ChangeConfigurationRequest(KeyMeterValuesSampledData, meterValues); err == nil || meterValues == "disable" {
-			cp.meterValuesSample = meterValues
-		} else {
+		if err := cp.ChangeConfigurationRequest(KeyMeterValuesSampledData, meterValues); err != nil {
 			cp.log.WARN.Printf("failed configuring %s: %v", KeyMeterValuesSampledData, err)
 		}
+		cp.meterValuesSample = meterValues
 	}
 
 	// trigger initial meter values