diff --git a/src/Form/WebformSubmissionResendForm.php b/src/Form/WebformSubmissionResendForm.php
index 98155eb38..8755b43e3 100644
--- a/src/Form/WebformSubmissionResendForm.php
+++ b/src/Form/WebformSubmissionResendForm.php
@@ -201,7 +201,7 @@ class WebformSubmissionResendForm extends FormBase {
     // Get options.
     $options = [];
     foreach ($handlers as $handler_id => $message_handler) {
-      if (!($message_handler instanceof WebformHandlerMessageInterface)) {
+      if (!($message_handler instanceof WebformHandlerMessageInterface) || !$message_handler->checkConditions($webform_submission)) {
         continue;
       }
 
@@ -223,6 +223,7 @@ class WebformSubmissionResendForm extends FormBase {
       $options[$handler_id]['summary'] = [
         'data' => $message_handler->getMessageSummary($message),
       ];
+      $message_handler->setStatus(TRUE);
       $options[$handler_id]['status'] = ($message_handler->isEnabled()) ? $this->t('Enabled') : $this->t('Disabled');
     }
     return $options;