diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index e9ea521116..1b09a08d0b 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -65,6 +65,7 @@ if ( $input->param('updateLimits') && $op eq 'cud-update' ) {
 
     foreach my $code (@codes) {
         foreach my $toBranch (@branchcodes) {
+            next if $toBranch eq $branchcode;
             my $isSet = not $input->param( $code . "_" . $toBranch );
             if ($isSet) {
                 CreateBranchTransferLimit( $toBranch, $branchcode, $code );
diff --git a/installer/data/mysql/atomicupdate/bug_41131.pl b/installer/data/mysql/atomicupdate/bug_41131.pl
new file mode 100755
index 0000000000..6178d45157
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_41131.pl
@@ -0,0 +1,19 @@
+use Modern::Perl;
+use Koha::Installer::Output qw(say_warning say_success say_info);
+
+return {
+    bug_number  => "41131",
+    description => "Delete transfer limits that are from a branch to the same branch",
+    up          => sub {
+        my ($args) = @_;
+        my ( $dbh, $out ) = @$args{qw(dbh out)};
+
+        # Do you stuffs here
+        $dbh->do(
+            q{
+            DELETE FROM branch_transfer_limits WHERE toBranch = fromBranch;
+        }
+        );
+        say $out "Removed nonsensical transfer limits that prevent a branch transferring to itself";
+    },
+};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 35cc0d7d2c..6d0b21b937 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -97,7 +97,9 @@
                                             ></td
                                         >
                                         <td>
-                                            [% IF ( to_branch_loo.isChecked ) %]
+                                            [% IF ( to_branch_loo.toBranch == branchcode ) %]
+                                                <input type="checkbox" checked="checked" disabled="disabled" />
+                                            [% ELSIF ( to_branch_loo.isChecked ) %]
                                                 <input
                                                     type="checkbox"
                                                     class="cb cb[% codes_loo.code | html %]"