Here’s a link that explains the preferred method of storing RRD data as SI units to avoid the issue you’re having.
https://lists.oetiker.ch/pipermail/rrd-users/2012-July/018707.html
The relevant line on that page:
You should store them using GAUGE (as kW is already a rate). In fact, multiply by 1000 and store, as then you’re storing as Watt or Joules/sec, the SI unit, which is Best Practice.