Rice farming threatens freshwater resources, while also being increasingly vulnerable to drought due to climate change. Rice farming needs to become more sustainable and resilient to climate change by improving irrigation drainage systems. Small water bodies, used to store drainage water and supply irrigation in traditional rice farming systems have gradually been abandoned in recent decades. This has resulted in a higher water footprint (WF) associated with rice farming due to increased freshwater usage and wastewater release, also leaving rice production more vulnerable to extreme weather events. Here, we propose how protecting and reactivating small water bodies for rice irrigation and drainage can decrease rice production WF in China by 30%, save 9% of China’s freshwater consumption, increase irrigation self-sufficiency from 3% to 31%, and alleviate yield loss in dry years by 2–3%. These findings show that redesigning rice irrigation drainage systems can help meet water scarcity challenges posed by climate change.