diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 293cbeae6..3cd2926e5 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -119,11 +119,9 @@ class CalendarController extends AbstractController
 
     public function cancelAction(Calendar $calendar, Request $request): Response
     {
-        // Add voter
         // Deal with sms being sent or not
         // Communicate cancellation with the remote calendar.
 
-
         $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
 
         [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
@@ -146,6 +144,7 @@ class CalendarController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
 
             $calendar->setStatus($calendar::STATUS_CANCELED);
+            $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
             $this->em->flush();
 
             $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig