diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8df0ba7..6b400df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.17
+* Respect finding order in Project (and exportfindings)
+
 # 0.16
 * Remove locking
 * Strip bogus API token prefix if http header is provided
diff --git a/pyproject.toml b/pyproject.toml
index b955d5b..035255e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "reptor"
-version = "0.16"
+version = "0.17"
 authors = [
   { name="Richard Schwabe" },
   { name="Aron Molnar", email="aron@syslifters.com" }
diff --git a/reptor/models/Project.py b/reptor/models/Project.py
index 9012d43..823529b 100644
--- a/reptor/models/Project.py
+++ b/reptor/models/Project.py
@@ -40,7 +40,8 @@ def __init__(self, data: dict, project_design: ProjectDesign):
         for section in data.get("sections", []):
             self.sections.append(Section(section, project_design))
         # Order findings by their order attribute
-        self.findings.sort(key=lambda f: f.order, reverse=True)
+        if self.override_finding_order:
+            self.findings.sort(key=lambda f: f.order)
 
 
 class ProjectOverview(ProjectBase):