diff --git a/aep-schedule-website/src/frontend/components/schedules.rs b/aep-schedule-website/src/frontend/components/schedules.rs
index a1cc9edc02f47f8863f70c6f492bd009853f2703..e8a90355c6a9e26afe0d36114a5db01fcddf95ed 100644
--- a/aep-schedule-website/src/frontend/components/schedules.rs
+++ b/aep-schedule-website/src/frontend/components/schedules.rs
@@ -16,22 +16,28 @@ pub fn SchedulesComponent() -> impl IntoView {
                 match state.step.get() == 6 {
                     true => {
                         let calendar = Rc::new(calendar.clone().unwrap());
-                        view !{
-                            <For
-                                each=move || {state.schedule.get()}
-                                key= |course| course.id
-                                children= move |schedule| {
-                                    let calendar = Rc::clone(&calendar);
-                                    view !{
-                                        <ScheduleComponent schedule calendar/>
+                        if state.schedule.get().is_empty() {
+                            view! {
+                                <h3 class="content-center h-full">
+                                    "Il n'y a pas d'horaires possibles!"
+                                </h3>
+                            }
+                                .into_view()
+                        } else {
+                            view! {
+                                <For
+                                    each=move || { state.schedule.get() }
+                                    key=|course| course.id
+                                    children=move |schedule| {
+                                        let calendar = Rc::clone(&calendar);
+                                        view! { <ScheduleComponent schedule calendar /> }
                                     }
-                                }
-                            />
+                                />
+                            }
+                                .into_view()
                         }
-                    },
-                    _ => view ! {
-                        <Todo/>
                     }
+                    _ => view! { <Todo /> },
                 }
             }
         />