diff --git a/installer/data/mysql/atomicupdate/bug_23659_add_default_pickup_location_syspref.pl b/installer/data/mysql/atomicupdate/bug_23659_add_default_pickup_location_syspref.pl
new file mode 100755
index 0000000000..b9c49f9852
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_23659_add_default_pickup_location_syspref.pl
@@ -0,0 +1,17 @@
+use Modern::Perl;
+
+return {
+    bug_number => "23659",
+    description => "Add DefaultHoldPickupLocation syspref",
+    up => sub {
+        my ($args) = @_;
+        my ($dbh, $out) = @$args{qw(dbh out)};
+        # Do you stuffs here
+        $dbh->do(q{
+            INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
+            ('DefaultHoldPickupLocation','loggedinlibrary','loggedinlibrary|homebranch|holdingbranch','Which branch should a hold pickup location default to. ','choice')
+        });
+        # Print useful stuff here
+        say $out "Added DefaultHoldPickupLocation syspref";
+    },
+};
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 581e6be18b..1065b441f1 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -164,6 +164,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('DefaultHoldExpirationdate','0','','Automatically set expiration date for holds','YesNo'),
 ('DefaultHoldExpirationdatePeriod','0','','How long into the future default expiration date is set to be.','integer'),
 ('DefaultHoldExpirationdateUnitOfTime','days','days|months|years','Which unit of time is used when setting the default expiration date. ','choice'),
+('DefaultHoldPickupLocation','loggedinlibrary','loggedinlibrary|homelibrary','Which branch should a hold pickup location default to. ','choice'),
 ('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'),
 ('DefaultLongOverdueSkipLostStatuses', '', NULL, 'Skip these lost statuses by default in longoverdue.pl', 'Free'),
 ('DefaultLongOverdueChargeValue', '', NULL, "Charge a lost item to the borrower's account when the LOST value of the item changes to n.", 'integer'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 6810f251c5..b4d6a761b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -936,6 +936,14 @@ Circulation:
                   months: months
                   years: years
             - from reserve date.
+        -
+            - When placing a hold via the staff client default the pickup location to the
+            - pref: DefaultHoldPickupLocation
+              default: loggedinlibrary
+              choices:
+                  loggedinlibrary: "logged in library"
+                  homebranch: "item's home branch"
+                  holdingbranch: "item's holding branch"
     Interlibrary loans:
         -
             - pref: ILLModule
diff --git a/reserve/request.pl b/reserve/request.pl
index 8c1f107e00..b6bdb0baff 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -493,6 +493,16 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
 
                     $item->{item_level_holds} = Koha::CirculationRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
 
+                    my $default_hold_pickup_location_pref = C4::Context->preference('DefaultHoldPickupLocation');
+                    my $default_pickup_branch;
+                    if( $default_hold_pickup_location_pref eq 'homebranch' ){
+                        $default_pickup_branch = $item->{homebranch};
+                    } elsif ( $default_hold_pickup_location_pref eq 'holdingbranch' ){
+                        $default_pickup_branch = $item->{holdingbranch};
+                    } else {
+                        $default_pickup_branch = C4::Context->userenv->{branch};
+                    }
+
                     if (
                            !$item->{cantreserve}
                         && !$exceeded_maxreserves
@@ -509,7 +519,7 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                             $num_items_available++;
                             $item->{available} = 1;
                             # pass the holding branch for use as default
-                            my $default_pickup_location = $pickup_locations->search({ branchcode => $item->{holdingbranch} })->next;
+                            my $default_pickup_location = $pickup_locations->search({ branchcode => $default_pickup_branch })->next;
                             $item->{default_pickup_location} = $default_pickup_location;
                         }
                         else {
@@ -533,10 +543,7 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
 
                                 my $default_pickup_location;
 
-                                # Default to logged-in, if valid
-                                if ( C4::Context->userenv->{branch} ) {
-                                    ($default_pickup_location) = grep { $_->branchcode eq C4::Context->userenv->{branch} } @pickup_locations;
-                                }
+                                ($default_pickup_location) = grep { $_->branchcode eq $default_pickup_branch } @pickup_locations;
 
                                 $item->{default_pickup_location} = $default_pickup_location;
                             }