diff --git a/about.pl b/about.pl
index 39e04930cf..eaaf419b2f 100755
--- a/about.pl
+++ b/about.pl
@@ -179,7 +179,7 @@ if ( $tab eq 'about' ) {
         $where_is_memcached_config = 'config_only';
     }
 
-    message_broker_check($template);
+    job_notification_method_check($template);
     elasticsearch_check($template);
 
     $template->param(
@@ -599,7 +599,7 @@ if ( $tab eq 'sysinfo' ) {
         $template->param( warnFastCataloging      => $no_FA_framework );
     }
 
-    message_broker_check($template);
+    job_notification_method_check($template);
 
     #BZ 28267: Warn administrators if there are database rows with a format other than 'DYNAMIC'
     {
@@ -907,17 +907,15 @@ sub elasticsearch_check {
     }
 }
 
-sub message_broker_check {
-    my $template = shift;
-    {
+sub job_notification_method_check {
+    my ($template) = @_;
+
+    if ( C4::Context->preference('JobsNotificationMethod') eq 'STOMP' ) {
+
         # BackgroundJob - test connection to message broker
         my $conn = Koha::BackgroundJob->connect;
         if ( !$conn ) {
-            if ( C4::Context->preference('JobsNotificationMethod') eq 'STOMP' ) {
-                $template->param( warnConnectBroker => 'Error connecting' );
-            } else {
-                $template->param( warnConnectBroker => C4::Context->preference('JobsNotificationMethod') );
-            }
+            $template->param( warnConnectBroker => 1 );
         }
     }
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index e6674bbc89..71b5a91153 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -223,12 +223,14 @@
             </tr>
             <tr>
                 <th scope="row">Message broker: </th>
-                [% IF warnConnectBroker == 'Error connecting' %]
+                [% IF warnConnectBroker %]
                     <td class="text-bg-warning"><strong>Using SQL polling (Fallback, Error connecting to RabbitMQ)</strong></td>
-                [% ELSIF warnConnectBroker %]
-                    <td class="text-bg-warning"><strong>Using SQL polling</strong></td>
                 [% ELSE %]
-                    <td class="text-bg-info">Using RabbitMQ</td>
+                    [% IF Koha.Preference('JobsNotificationMethod') == 'polling' %]
+                        <td class="text-bg-info">Using SQL polling</td>
+                    [% ELSE %]
+                        <td class="text-bg-info">Using RabbitMQ</td>
+                    [% END %]
                 [% END %]
             </tr>
             <tr>