diff --git a/classes/persistents/message.php b/classes/persistents/message.php
index 039401d..b255ed3 100644
--- a/classes/persistents/message.php
+++ b/classes/persistents/message.php
@@ -262,6 +262,8 @@ public function get_message_recipients($status = 'all', $asuseridarray = false)
         foreach ($recipients as $recip) {
             if ($this->quick_enrol_check($recip->get('user_id'), $this->get('course_id'))) {
                 $checkedrecipients[] = $recip;
+            } else {
+                $recip->remove_recipient_from_message($messageid, $recip->get('user_id'));
             }
         }