diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
index 8550947257..ad6b84f2ab 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -183,7 +183,7 @@ function CustomReportInner({
   sessionStorage.setItem('prevUrl', prevUrl);
   sessionStorage.setItem('url', location.pathname);
 
-  if (['/reports'].includes(prevUrl)) sessionStorage.clear();
+  if (prevUrl !== location.pathname) sessionStorage.clear();
 
   const reportFromSessionStorage = sessionStorage.getItem('report');
   const session: Partial<CustomReportEntity> = reportFromSessionStorage
diff --git a/upcoming-release-notes/7356.md b/upcoming-release-notes/7356.md
new file mode 100644
index 0000000000..e7b446766f
--- /dev/null
+++ b/upcoming-release-notes/7356.md
@@ -0,0 +1,6 @@
+---
+category: Bugfixes
+authors: [tmchow]
+---
+
+Fix custom report editor retaining unsaved settings when navigating between routes.