diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 32c77a03015..a59d7d1ee97 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3227,7 +3227,6 @@ EOD;
         if (isloggedin()) {
             $context = [
                 'userid' => $USER->id,
-                'blocknoncontacts' => get_user_preferences('message_blocknoncontacts', '', $USER->id),
                 'urls' => [
                     'preferences' => (new moodle_url('/message/edit.php', ['id' => $USER->id]))->out(),
                 ],
diff --git a/message/renderer.php b/message/renderer.php
index 66dbad759c7..0b964fc375f 100644
--- a/message/renderer.php
+++ b/message/renderer.php
@@ -253,7 +253,8 @@ class core_message_renderer extends plugin_renderer_base {
         $preferences = get_all_message_preferences($readyprocessors, $providers, $user);
         $notificationlistoutput = new \core_message\output\preferences\message_notification_list($readyprocessors, $providers, $preferences, $user);
         $context = $notificationlistoutput->export_for_template($this);
+        $context['blocknoncontacts'] = get_user_preferences('message_blocknoncontacts', '', $user->id) ? true : false;
 
-        return $this->render_from_template('message/message_preferences', $notificationlistoutput->export_for_template($this));
+        return $this->render_from_template('message/message_preferences', $context);
     }
 }