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 04ec113eba..7321c828a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -679,7 +679,7 @@
                                                     [% END # /IF force_hold_level %]
                                                 </td>
                                                 <td>
-                                                [% IF (itemloo.pickup_locations_count > 0) %]
+                                                [% IF (itemloo.pickup_locations_count > 0) || itemloo.override %]
                                                     <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 %]"
@@ -1385,7 +1385,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 65b05ad80b..ac78ffdb13 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -503,13 +503,21 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                         $default_pickup_branch = C4::Context->userenv->{branch};
                     }
 
-                    if (
-                           !$item->{cantreserve}
-                        && !$exceeded_maxreserves
-                        && $can_item_be_reserved eq 'OK'
-                        # items_any_available defined outside of the current loop,
-                        # so we avoiding loop inside IsAvailableForItemLevelRequest:
-                        && IsAvailableForItemLevelRequest($item_object, $patron, undef, $items_any_available)
+                    if ( $can_item_be_reserved eq 'itemAlreadyOnHold' ) {
+                        # itemAlreadyOnHold cannot be overridden
+                        $num_alreadyheld++
+                    }
+                    elsif (
+                        (
+                               !$item->{cantreserve}
+                            && !$exceeded_maxreserves
+                            && $can_item_be_reserved eq 'OK'
+                            # items_any_available defined outside of the current loop,
+                            # so we avoiding loop inside IsAvailableForItemLevelRequest:
+                            && IsAvailableForItemLevelRequest($item_object, $patron, undef, $items_any_available)
+                        ) || C4::Context->preference('AllowHoldPolicyOverride')
+                             # If AllowHoldPolicyOverride is set, it overrides EVERY restriction
+                             # not just branch item rules
                       )
                     {
                         # Send the pickup locations count to the UI, the pickup locations will be pulled using the API
@@ -522,37 +530,17 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                             my $default_pickup_location = $pickup_locations->search({ branchcode => $default_pickup_branch })->next;
                             $item->{default_pickup_location} = $default_pickup_location;
                         }
+                        elsif ( C4::Context->preference('AllowHoldPolicyOverride') ){
+                             $num_items_available++;
+                             $item->{override} = 1;
+                            my $default_pickup_location = $pickup_locations->search({ branchcode => $default_pickup_branch })->next;
+                            $item->{default_pickup_location} = $default_pickup_location;
+                        }
                         else {
                             $item->{available} = 0;
                             $item->{not_holdable} = "no_valid_pickup_location";
                         }
 
-                        push( @available_itemtypes, $item->{itype} );
-                    }
-                    elsif ( C4::Context->preference('AllowHoldPolicyOverride') ) {
-                        # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
-                        # with the exception of itemAlreadyOnHold because, you know, the item is already on hold
-                        if ( $can_item_be_reserved ne 'itemAlreadyOnHold' ) {
-                            # 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 })->as_list;
-                            $item->{pickup_locations_count} = scalar @pickup_locations;
-
-                            if ( @pickup_locations ) {
-                                $num_items_available++;
-                                $item->{override} = 1;
-
-                                my $default_pickup_location;
-
-                                ($default_pickup_location) = grep { $_->branchcode eq $default_pickup_branch } @pickup_locations;
-
-                                $item->{default_pickup_location} = $default_pickup_location;
-                            }
-                            else {
-                                $item->{available} = 0;
-                                $item->{not_holdable} = "no_valid_pickup_location";
-                            }
-                        } else { $num_alreadyheld++ }
-
                         push( @available_itemtypes, $item->{itype} );
                     } else {
                         # If none of the conditions hold true, then neither override nor available is set and the item cannot be checked