diff --git a/lib/adminlib.php b/lib/adminlib.php
index 426d7046f2c..6f92c68a615 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -11800,7 +11800,9 @@ class admin_setting_check extends admin_setting {
         $output = $OUTPUT->notification($loadingicon . $loadingstr, \core\output\notification::NOTIFY_INFO, false);
 
         // Add the action link.
-        $output .= $OUTPUT->render($this->check->get_action_link());
+        if ($actionlink = $this->check->get_action_link()) {
+            $output .= $OUTPUT->render($actionlink);
+        }
 
         // Wrap in a div with a reference. The JS getAndRender will replace this with the response from the webservice.
         $statusdiv = \html_writer::div($output, '', ['data-check-reference' => $domref]);
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index 60e88d2bb45..7038472e83c 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -1338,7 +1338,9 @@ class core_renderer extends renderer_base {
         }
 
         // Add the action link.
-        $renderedresult .= $this->render_action_link($check->get_action_link());
+        if ($actionlink = $check->get_action_link()) {
+            $renderedresult .= $this->render_action_link($actionlink);
+        }
 
         return $renderedresult;
     }