diff --git a/vehicle/tesla/controller.go b/vehicle/tesla/controller.go
index 61cf046d0..749e229d6 100644
--- a/vehicle/tesla/controller.go
+++ b/vehicle/tesla/controller.go
@@ -31,7 +31,10 @@ func NewController(ro, rw *tesla.Vehicle) *Controller {
 			return float64(v.current), nil
 		}
 		res, err := ro.Data()
-		return float64(res.Response.ChargeState.ChargeAmps), apiError(err)
+		if err != nil {
+			return 0, apiError(err)
+		}
+		return float64(res.Response.ChargeState.ChargeAmps), nil
 	}, time.Minute)
 
 	return v