diff --git a/src/addons/mod/forum/services/handlers/push-click.ts b/src/addons/mod/forum/services/handlers/push-click.ts
index 220a3cce2..fb520cc3e 100644
--- a/src/addons/mod/forum/services/handlers/push-click.ts
+++ b/src/addons/mod/forum/services/handlers/push-click.ts
@@ -61,6 +61,8 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio
         const cmId = Number(data.cmid);
         const pageParams: Params = {
             forumId: Number(data.instance),
+            cmId,
+            courseId,
         };
 
         if (data.postid || contextUrlParams.urlHash) {
@@ -68,11 +70,11 @@ export class AddonModForumPushClickHandlerService implements CorePushNotificatio
         }
 
         await CoreUtils.ignoreErrors(
-            AddonModForum.invalidateDiscussionPosts(pageParams.discussionId, undefined, notification.site),
+            AddonModForum.invalidateDiscussionPosts(discussionId, undefined, notification.site),
         );
 
         await CoreNavigator.navigateToSitePath(
-            `${AddonModForumModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/${discussionId}`,
+            `${AddonModForumModuleHandlerService.PAGE_NAME}/discussion/${discussionId}`,
             { siteId: notification.site, params: pageParams },
         );
     }