diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 67f854104d..69f2c61393 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -789,7 +789,7 @@
                                                     [% END # /IF force_hold_level %]
                                                 </td>
                                                 <td>
-                                                [% IF (itemloo.pickup_locations_count > 0) %]
+                                                [% IF (itemloo.pickup_locations_count > 0) || Koha.Preference('AllowHoldPolicyOverride') %]
                                                     <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations" style="width:100%;"
                                                             data-item-id="[% itemloo.itemnumber | html %]"
                                                             data-patron-id="[% patron.borrowernumber | html %]"
@@ -1507,7 +1507,7 @@
                     msg = (_("- Please select an item to place a hold") + "\n");
                 }
             } else {
-                if( $("#pickup").length < 1 || $("#pickup").val() == "" ){
+                if( $("#pickup").length < 1 || $("#pickup").val() == "" || $('#pickup').val() === null ){
                     msg = _("- Please select a pickup location for this hold" + "\n");
                 }
             }
diff --git a/reserve/request.pl b/reserve/request.pl
index f68f46762f..e94616add9 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -512,7 +512,7 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                         # Send the pickup locations count to the UI, the pickup locations will be pulled using the API
                         my $pickup_locations = $item_object->pickup_locations({ patron => $patron });
                         $item->{pickup_locations_count} = $pickup_locations->count;
-                        if ( $item->{pickup_locations_count} > 0 ) {
+                        if ( $item->{pickup_locations_count} > 0 || C4::Context->preference('AllowHoldPolicyOverride') ) {
                             $num_items_available++;
                             $item->{available} = 1;
                             # pass the holding branch for use as default
@@ -534,7 +534,7 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                             my @pickup_locations = $item_object->pickup_locations({ patron => $patron })->as_list;
                             $item->{pickup_locations_count} = scalar @pickup_locations;
 
-                            if ( @pickup_locations ) {
+                            if ( @pickup_locations || C4::Context->preference('AllowHoldPolicyOverride') ) {
                                 $num_items_available++;
                                 $item->{override} = 1;