Replace it sooner than later... my 6p's battery lost a lot of life, charging became irratic, then it literally caught fire when the tech was replacing the screen and battery. Now on a Pixel 2 XL (since I couldn't wait for the 6p replacement at the time).