diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 504981ed58..30a2351112 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -606,7 +606,7 @@
                                     <label for="branchcode">Library:</label>
                                     <select name="branchcode" id="branchcode">
                                         <option value="">Any</option>
-                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => suggestion.branchcode ) %]
+                                        [% PROCESS options_for_libraries libraries => Branches.all( selected => suggestion.branchcode || default_branch ) %]
                                     </select>
                                 </li>
                                 <li> [% PROCESS funds_dropdown %] </li>
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index ab4d352bd6..284a47b5a8 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -296,7 +296,6 @@ if ( $op =~ /cud-save/ ) {
     $template->param(
         other_reason        => $other_reason,
         default_manageddate => dt_from_string,
-        default_branch      => C4::Context->userenv->{"branch"},
     );
     $op = 'save';
 } elsif ( $op eq "cud-update_status" ) {