Climate change impacts on both yields and quality have increased over the past decades, with the effects of extreme climate events having the most dramatic and obvious impacts. Increasing length and intensity of heatwaves associated with increased water stress necessitates a reevaluation of climate change responses of grapevine and, ultimately, a reconsideration of vineyard management practices under future conditions. Here we summarize results from a three-year field trial manipulating irrigation prior to and during heatwave events to assess impacts of water application rates on vine health and physiology, berry chemistry, and wine quality. We also highlight potential mitigation strategies for extreme heat, both in terms of water application, as well as other cultural practices that could be widely applicable.