The article highlights the ongoing challenges faced by farmers in Rwanda's Nyagatare district, a key agricultural region, due to water scarcity exacerbated by a dam construction project. This issue led to conflicts among farmers and livestock owners over water usage. The introduction of the Capacity Development for Agricultural Innovation Systems (CDAIS) project, funded by the European Union and implemented by the Food and Agriculture Organization (FAO) and Agrinatura, aimed to foster dialogue and innovative solutions. The project's success in resolving water-sharing conflicts and enhancing productivity was marked by significant increases in rice yield and improvements in farmers' business skills and market access. However, the ongoing COVID-19 pandemic has negatively impacted farmers by reducing income and disrupting market connections, leading to challenges in recovering from losses and reinvesting in farming activities. The FAO is now focusing on assessing water efficiency and developing strategies to support farmers in overcoming these setbacks.