diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts
index f50bc32cb..94ffc0b1a 100644
--- a/packages/core/ui/frame/frame-common.ts
+++ b/packages/core/ui/frame/frame-common.ts
@@ -427,8 +427,8 @@ export class FrameBase extends CustomLayoutView {
 			eventName: Page.navigatingToEvent,
 			object: this,
 			isBack,
-			entry: backstackEntry.entry,
-			fromEntry: this.currentEntry,
+			entry: backstackEntry,
+			fromEntry: this._currentEntry,
 		});
 	}