diff --git a/cmd/setup.go b/cmd/setup.go
index 98f52afb1..d7b1c1c48 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -107,12 +107,13 @@ func configureDatabase(conf server.InfluxConfig, loadPoints []loadpoint.API, in
 	)
 
 	// eliminate duplicate values
-	dedupe := pipe.NewDeduplicator(30*time.Minute, "vehicleSoC", "vehicleRange", "vehicleOdometer")
+	dedupe := pipe.NewDeduplicator(30*time.Minute, "vehicleCapacity", "vehicleSoC", "vehicleRange", "vehicleOdometer", "chargedEnergy", "chargeRemainingEnergy")
 	in = dedupe.Pipe(in)
 
 	// reduce number of values written to influx
-	limiter := pipe.NewLimiter(5 * time.Second)
-	in = limiter.Pipe(in)
+	// TODO this breaks writing vehicleRange as its re-writting in short interval
+	// limiter := pipe.NewLimiter(5 * time.Second)
+	// in = limiter.Pipe(in)
 
 	go influx.Run(loadPoints, in)
 }