diff --git a/addons/survey/models/survey.py b/addons/survey/models/survey.py
index 95a1cc1fdd1..91730d88b88 100644
--- a/addons/survey/models/survey.py
+++ b/addons/survey/models/survey.py
@@ -744,6 +744,7 @@ class SurveyUserInput(models.Model):
         """ Send again the invitation """
         self.ensure_one()
         local_context = {
+            'survey_resent_user_input': self.id,
             'survey_resent_token': True,
             'default_partner_ids': self.partner_id and [self.partner_id.id] or [],
             'default_multi_email': self.email or "",
diff --git a/addons/survey/wizard/survey_email_compose_message.py b/addons/survey/wizard/survey_email_compose_message.py
index f57cc226b6c..375499ae512 100644
--- a/addons/survey/wizard/survey_email_compose_message.py
+++ b/addons/survey/wizard/survey_email_compose_message.py
@@ -135,6 +135,10 @@ class SurveyMailComposeMessage(models.TransientModel):
             Mail.create(values).send()
 
         def create_token(wizard, partner_id, email):
+            if context.get("survey_resent_user_input"):
+                survey_user_input = SurveyUserInput.browse(context.get("survey_resent_user_input"))
+                if survey_user_input.state in ('new', 'skip'):
+                    return survey_user_input.token
             if context.get("survey_resent_token"):
                 survey_user_input = SurveyUserInput.search([('survey_id', '=', wizard.survey_id.id),
                     ('state', 'in', ['new', 'skip']), '|', ('partner_id', '=', partner_id),