diff --git a/ReleaseNotes2_3.md b/ReleaseNotes2_3.md
index 67680a8a..b2f4ec98 100644
--- a/ReleaseNotes2_3.md
+++ b/ReleaseNotes2_3.md
@@ -53,3 +53,4 @@ This document describes the changes and updates that have been made in version 2
 - `EN_PRESS_UNITS` can now be used with `EN_getoption` and `EN_setoption` to get or set the pressure unit used in EPANET.
 - Continuous barrier functions were added to constrain emitter flows to allowable values.
 - The `EN_openx` function has been added to enable the opening of input files with formatting errors through the API. This allows users to continue using toolkit functions even when such errors are present.
+- Fixed a bug in EN_setnodevalue with EN_EMITTER option that could cause NaN results.
\ No newline at end of file
diff --git a/src/epanet.c b/src/epanet.c
index 86b510ba..7e3ef8f5 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -2429,6 +2429,7 @@ int DLLEXPORT EN_setnodevalue(EN_Project p, int index, int property, double valu
         if (value < 0.0) return 209;
         if (value > 0.0) value = pow((Ucf[FLOW] / value), hyd->Qexp) / Ucf[PRESSURE];
         Node[index].Ke = value;
+        if (hyd->EmitterFlow[index] == 0.0) hyd->EmitterFlow[index] = 1.0;
         break;
 
     case EN_INITQUAL: