diff --git a/scripts/pr-lib/changelog.sh b/scripts/pr-lib/changelog.sh
index 84a12b786b9..c0620b7088b 100644
--- a/scripts/pr-lib/changelog.sh
+++ b/scripts/pr-lib/changelog.sh
@@ -226,14 +226,12 @@ END {
     release_line = 0
     section_line = 0
     for (i = entry_line; i >= 1; i--) {
-      if (release_line == 0 && changelog[i] ~ /^## /) {
-        release_line = i
-      }
-      if (changelog[i] ~ /^### /) {
+      if (section_line == 0 && changelog[i] ~ /^### /) {
         section_line = i
-        break
+        continue
       }
       if (changelog[i] ~ /^## /) {
+        release_line = i
         break
       }
     }