diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
index 6ed5e724f2..09562c9b3d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
@@ -9,7 +9,6 @@
                 </li>
                 <form id="dismiss-message-form" action="/cgi-bin/koha/opac-dismiss-message.pl" method="post">
                     <input type="hidden" name="message_id" value="[% message.message_id | html %]">
-                    <input type="hidden" name="patron_id" value="[% message.borrowernumber | html %]">
                     <button type="submit" class="dismiss-message-button btn btn-primary"><i class="fa fa-trash" aria-hidden="true"></i> Dismiss</button>
                 </form>
             [% END %]
diff --git a/opac/opac-dismiss-message.pl b/opac/opac-dismiss-message.pl
index 789825c035..0b4026cbc0 100755
--- a/opac/opac-dismiss-message.pl
+++ b/opac/opac-dismiss-message.pl
@@ -35,10 +35,14 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $patron_id = $query->param('patron_id');
-my $patron = Koha::Patrons->find( $patron_id );
-my $message_id = $query->param('message_id');
-my $message = $patron->messages->find( $message_id );
+my $logged_in_user = Koha::Patrons->find($borrowernumber);
+my $message_id     = $query->param('message_id');
+my $message        = $logged_in_user->messages->find($message_id);
+
+unless ($message) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
 
 unless ( $message ) {
     # exit early