diff --git a/src/Pages/EmissionManager.vue b/src/Pages/EmissionManager.vue
index b8acec78f55b1d218bedcda7bedb6a2e0e8eebd4..ee2921815637fdc706ea371d765c7e1a91f47d1f 100644
--- a/src/Pages/EmissionManager.vue
+++ b/src/Pages/EmissionManager.vue
@@ -77,14 +77,16 @@
       <server-errors :errors="serverErrors" />
 
       <div class="tw-h-full">
-        <div class="tw-h-full" :class="{ 'tw-hidden': view !== 'week' }">
-          <FullCalendar ref="calendar" :options="calendarConfig" />
-        </div>
+        <KeepAlive>
+          <div v-if="view === 'week'" class="tw-h-full">
+            <FullCalendar ref="calendar" :options="calendarConfig" />
+          </div>
+        </KeepAlive>
 
         <div
+          v-if="view === 'day'"
           :class="{
             'schedule-panel tw-w-full': true,
-            'tw-hidden': view !== 'day',
           }"
         >
           <div class="tw-flex tw-items-center tw-justify-between tw-mb-4">