That will be after the Great White throne judgment when everything is destroyed and remade. The Earth may well resemble what the Earth was like prior to the fall of man during the millennial reign of Christ....yet apparently with some issues...like the warnings issued to the nations that don’t send delegations during the feasts of booths....as stated in Jeremiah. “And if Egypt does not go up, they shall receive no rain....”.
I do believe it will be brought back to what it was,the earth prior to the fall. Good news, even any possible issues as you have mentioned will be gone as well.