diff --git a/src/router/index.js b/src/router/index.js
index 5c4b6ca75..4d14f70de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -183,7 +183,7 @@ async function navigate(scenario, currentRoute, isSavingNavigation, optionalQuer
 
     // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object
     const existingPageDataForPage = store.getters.pageData(destinationFmgPageValue);
-    baseMixin.methods.savePageDataToStore(destinationFmgPageValue, optionalPageData ? optionalPageData : existingPageDataForPage ?? {});
+    baseMixin.methods.savePageDataToStore(destinationFmgPageValue, Object.keys(optionalPageData).length > 0 ? optionalPageData : existingPageDataForPage ?? {});
 
     optionalParams.isSavingNavigation = isSavingNavigation;