diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm
index 81590785e3..b9fc11c941 100644
--- a/Koha/CirculationRules.pm
+++ b/Koha/CirculationRules.pm
@@ -112,6 +112,10 @@ our $RULE_KINDS = {
     hardduedatecompare => {
         scope => [ 'branchcode', 'categorycode', 'itemtype' ],
     },
+    waiting_hold_cancellation => {
+        scope        => [ 'branchcode', 'categorycode', 'itemtype' ],
+        can_be_blank => 0,
+    },
     holds_per_day => {
         scope => [ 'branchcode', 'categorycode', 'itemtype' ],
     },
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index b7f2ae643e..d8fffaf924 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -660,8 +660,41 @@ elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
             }
         );
     }
+} elsif ( $op eq "set-waiting-hold-cancellation" ) {
+
+    my $category = $input->param('waiting_hold_cancellation_category');
+    my $itemtype = $input->param('waiting_hold_cancellation_itemtype');
+    my $policy   = strip_non_numeric( scalar $input->param('waiting_hold_cancellation_policy') )
+                    ? 1
+                    : 0;
+
+    Koha::Exception->throw("No value passed for waiting holds cancellation policy")
+      if not defined $policy # There is a JS check for that
+      || $policy eq '';
+
+    Koha::CirculationRules->set_rules(
+        {   categorycode => ( $category eq '*' ) ? undef : $category,
+            itemtype     => ( $itemtype eq '*' ) ? undef : $itemtype,
+            branchcode   => ( $branch   eq '*' ) ? undef : $branch,
+            rules        => { waiting_hold_cancellation => $policy },
+        }
+    );
+
+} elsif ( $op eq 'del-waiting-hold-cancellation' ) {
+
+    my $category = $input->param('waiting_hold_cancellation_category');
+    my $itemtype = $input->param('waiting_hold_cancellation_itemtype');
+
+    Koha::CirculationRules->set_rules(
+        {   categorycode => ( $category eq '*' ) ? undef : $category,
+            itemtype     => ( $itemtype eq '*' ) ? undef : $itemtype,
+            branchcode   => ( $branch   eq '*' ) ? undef : $branch,
+            rules        => { waiting_hold_cancellation => undef },
+        }
+    );
 }
 
+
 my $refundLostItemFeeRule = Koha::CirculationRules->find({ branchcode => ($branch eq '*') ? undef : $branch, rule_name => 'lostreturn' });
 my $defaultLostItemFeeRule = Koha::CirculationRules->find({ branchcode => undef, rule_name => 'lostreturn' });
 $template->param(
diff --git a/installer/data/mysql/atomicupdate/bug_22456.pl b/installer/data/mysql/atomicupdate/bug_22456.pl
index df6e42da84..d7cef277b2 100755
--- a/installer/data/mysql/atomicupdate/bug_22456.pl
+++ b/installer/data/mysql/atomicupdate/bug_22456.pl
@@ -17,5 +17,21 @@ return {
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
             });
         }
+
+        my ($count) = $dbh->selectrow_array(q{
+                SELECT COUNT(*)
+                FROM circulation_rules
+                WHERE rule_name = 'waiting_hold_cancellation'
+        });
+
+        unless ( $count ) {
+            $dbh->do(q{
+                INSERT INTO circulation_rules (rule_name, rule_value)
+                VALUES ('waiting_hold_cancellation', 0)
+            });
+        }
+        else {
+            say $out "Found already existing 'waiting_hold_cancellation' circulation rules on the DB. Please review.";
+        }
     },
 };
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 1e8bc8907e..6727885768 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -845,6 +845,89 @@
     </div>
     [% END %]
 
+    <div id="waiting-hold-cancel-category" class="container">
+    [% IF humanbranch %]
+        <h3>Waiting hold cancellation policy for [% Branches.GetName( humanbranch ) | html %]</h3>
+    [% ELSE %]
+        <h3>Default waiting hold cancellation policy</h3>
+    [% END %]
+        <p>Specify if waiting holds can be cancelled for a given patron category.</p>
+        <form id="set-waiting-hold-cancellation" method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
+            <input type="hidden" name="op" value="set-waiting-hold-cancellation" />
+            <input type="hidden" name="branch" value="[% current_branch | html %]"/>
+            <table>
+                <tr>
+                    <th>Patron category</th>
+                    <th>Item type</th>
+                    <th>Cancellation allowed</th>
+                    <th>&nbsp;</th>
+                </tr>
+    [% FOREACH c IN categorycodes %]
+        [% SET c = '*' UNLESS c.defined AND c != '' %]
+        [% FOREACH i IN itemtypes %]
+            [% SET i = '*' UNLESS i.defined AND i != '' %]
+
+            [% SET waiting_hold_cancellation = CirculationRules.Search( current_branch, c, i, 'waiting_hold_cancellation' ) %]
+
+            [% IF ( waiting_hold_cancellation.defined && waiting_hold_cancellation != '' ) %]
+                <tr>
+                    <td>
+                        [% IF c == '*' %]
+                            <em>All</em>
+                        [% ELSE %]
+                            [% Categories.GetName(c) | html %]
+                        [% END %]
+                    </td>
+                    <td>
+                        [% IF i == '*' %]
+                            <em>All</em>
+                        [% ELSE %]
+                            [% ItemTypes.GetDescription(i,1) | html %]
+                        [% END %]
+                    </td>
+                    <td>
+                        [% IF waiting_hold_cancellation %]
+                            <span>Yes</span>
+                        [% ELSE %]
+                            <span>No</span>
+                        [% END %]
+                    </td>
+                    <td class="actions">
+                        <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=del-waiting-hold-cancellation&amp;waiting_hold_cancellation_category=[% c | uri %]&amp;waiting_hold_cancellation_itemtype=[% i | uri %]&amp;branch=[% current_branch | uri %]"><i class="fa fa-trash"></i> Delete</a>
+                    </td>
+                </tr>
+            [% END %]
+        [% END %]
+    [% END %]
+                <tr>
+                    <td>
+                        <select name="waiting_hold_cancellation_category" id="waiting_hold_cancellation_category">
+                            <option value="*">All</option>
+                        [% FOREACH patron_category IN patron_categories %]
+                            <option value="[% patron_category.categorycode | html %]">[% patron_category.description | html %]</option>
+                        [% END %]
+                        </select>
+                    </td>
+                    <td>
+                        <select name="waiting_hold_cancellation_itemtype" id="waiting_hold_cancellation_itemtype">
+                            <option value="*">All</option>
+                        [% FOREACH itemtype IN itemtypeloop %]
+                            <option value="[% itemtype.itemtype | html %]">[% ItemTypes.GetDescription(itemtype.itemtype) | html %]</option>
+                        [% END %]
+                        </select>
+                    </td>
+                    <td>
+                        <select name="waiting_hold_cancellation_policy" id="waiting_hold_cancellation_policy">
+                            <option value="0" selected>No</option>
+                            <option value="1">Yes</option>
+                        </select>
+                    </td>
+                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
+                </tr>
+            </table>
+        </form>
+    </div>
+
 [% IF Koha.Preference('ArticleRequests') %]
     <div id="open-article-requests-limit-patron-category" class="container">
     [% IF humanbranch %]