diff --git a/circ/curbside_pickups.pl b/circ/curbside_pickups.pl
index 305d3cf595..63ba9aa9cb 100755
--- a/circ/curbside_pickups.pl
+++ b/circ/curbside_pickups.pl
@@ -45,7 +45,19 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $branchcode = C4::Context->userenv()->{'branch'};
-my $libraries  = Koha::Libraries->search( {}, { order_by => ['branchname'] } );
+
+my $policy;
+if ( C4::Context->preference('CurbsidePickup') ) {
+    $policy = Koha::CurbsidePickupPolicies->find( { branchcode => $branchcode } );
+}
+
+unless ( $policy && $policy->enabled ) {
+    $template->param( disabled_for_branch => 1 );
+    output_html_with_http_headers $input, $cookie, $template->output;
+    exit;
+}
+
+my $libraries = Koha::Libraries->search( {}, { order_by => ['branchname'] } );
 if ( $op eq 'find-patron' ) {
     my $borrowernumber = $input->param('borrowernumber');
 
@@ -150,7 +162,7 @@ $template->param(
     tab              => $tab,
     auto_refresh     => $auto_refresh,
     refresh_delay    => $refresh_delay,
-    policy           => Koha::CurbsidePickupPolicies->find( { branchcode => $branchcode } ),
+    policy           => $policy,
     curbside_pickups => Koha::CurbsidePickups->search(
         {
             branchcode => $branchcode,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
index 2faa7170d4..f1355f2c5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -84,16 +84,9 @@
     [% END %]
 [% END %]
 
-[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
-[% WRAPPER 'main-container.inc' aside=aside %]
+[% BLOCK curbside_pickups_enabled %]
     <h1>Curbside pickups</h1>
 
-    [% UNLESS policy.enabled %]
-        <div class="alert alert-warning"> Curbside pickups are not enabled for your library. </div>
-        [% INCLUDE 'intranet-bottom.inc' %]
-        [% STOP %]
-    [% END %]
-
     [% FOR m IN messages %]
         <div class="alert alert-[% m.type | html %]">
             [% SWITCH m.code %]
@@ -457,7 +450,7 @@
             [% END # /tab_panel %]
         [% END # /WRAPPER tab_panels %]
     [% END # /WRAPPER tabs %]
-[% END %]
+[% END # /BLOCK enabled %]
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
@@ -695,4 +688,18 @@
     </script>
 [% END %]
 
+[% BLOCK curbside_pickups_disabled %]
+    <h1>Curbside pickups</h1>
+    <div class="alert alert-info">Curbside pickups are not enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=CurbsidePickup">CurbsidePickup</a> system preference to use this feature.</div>
+[% END # /BLOCK disabled %]
+
+[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %]
+[% WRAPPER 'main-container.inc' aside=aside %]
+    [% IF !disabled_for_branch %]
+        [% PROCESS curbside_pickups_enabled %]
+    [% ELSE %]
+        [% PROCESS curbside_pickups_disabled %]
+    [% END %]
+[% END # /WRAPPER %]
+
 [% INCLUDE 'intranet-bottom.inc' %]