diff --git a/installer/data/mysql/atomicupdate/bug_42490.pl b/installer/data/mysql/atomicupdate/bug_42490.pl
new file mode 100755
index 0000000000..377b71afa7
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_42490.pl
@@ -0,0 +1,28 @@
+use Modern::Perl;
+use Koha::Installer::Output qw(say_warning say_success say_info);
+
+return {
+    bug_number  => "42490",
+    description => "Add system preferene LocalHoldsPriorityScope",
+    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 (
+                        'LocalHoldsPriorityScope',
+                        'checkin_and_queue',
+                        NULL,
+                        'Define whether these settings are used when building the holds queue or only when checking items in',
+                        'Choice'
+                        )
+        }
+        );
+
+        # sysprefs
+        say $out "Added new system preference 'LocalHoldsPriorityScope'";
+    },
+};
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 05c07c7e91..3a56a64d51 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -426,6 +426,7 @@ INSERT INTO systempreferences ( `variable`, `value` ) VALUES
 ('LocalHoldsPriority', 'None'),
 ('LocalHoldsPriorityItemControl', 'holdingbranch'),
 ('LocalHoldsPriorityPatronControl', 'PickupLibrary'),
+('LocalHoldsPriorityScope', 'checkin_and_queue'),
 ('LockExpiredDelay',''),
 ('LostChargesControl','ItemHomeLibrary'),
 ('makePreviousSerialAvailable','0'),
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 b8e32d335d..1851e8ca7b 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
@@ -1115,6 +1115,11 @@ Circulation:
               choices:
                   homebranch: "home library"
                   holdingbranch: "holding library"
+            - when
+            - pref: LocalHoldsPriorityScope
+              choices:
+                  checkin_and_queue: "checking items in and building the holds queue"
+                  checkin_only: "checking items in"
             - <br/><strong>Note:</strong> If a group option is selected, LocalHoldsPriorityPatronControl and LocalHoldsPriorityItemControl will use the <a href="/cgi-bin/koha/admin/library_groups.pl">library hold group</a> of the selected libraries.
         -
             - For