diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 7da682896..f247c69d4 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -202,6 +202,10 @@ class CalendarController extends AbstractController
     {
         $this->denyAccessUnlessGranted('ROLE_USER');
 
+        if (!$this->remoteCalendarConnector->isReady()) {
+            return $this->remoteCalendarConnector->getMakeReadyResponse($request->getUri());
+        }
+
         if (!$this->getUser() instanceof User) {
             throw new UnauthorizedHttpException('you are not an user');
         }