diff --git a/lib/templates/popover_region.mustache b/lib/templates/popover_region.mustache
index 18bd954cc5b..753ab80cf10 100644
--- a/lib/templates/popover_region.mustache
+++ b/lib/templates/popover_region.mustache
@@ -64,12 +64,14 @@
             {{> core/loading }}
         </div>
         {{$anchor}}
-            <a class="see-all-link"
-                href="{{{urls.seeall}}}">
-                <div class="popover-region-footer-container">
-                    <div class="popover-region-seeall-text">{{#str}} seeall, message {{/str}}</div>
-                </div>
-            </a>
+            {{#urls.seeall}}
+                <a class="see-all-link"
+                    href="{{{.}}}">
+                    <div class="popover-region-footer-container">
+                        <div class="popover-region-seeall-text">{{#str}} seeall, message {{/str}}</div>
+                    </div>
+                </a>
+            {{/urls.seeall}}
         {{/anchor}}
     </div>
 </div>
diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php
index a051f936f18..4e988f87614 100644
--- a/message/output/popup/lib.php
+++ b/message/output/popup/lib.php
@@ -61,6 +61,7 @@ function message_popup_render_navbar_output(\renderer_base $renderer) {
         $context = [
             'userid' => $USER->id,
             'urls' => [
+                'seeall' => (new moodle_url('/message/output/popup/notifications.php'))->out(),
                 'preferences' => (new moodle_url('/message/notificationpreferences.php', ['userid' => $USER->id]))->out(),
             ],
         ];