diff --git a/packages/flutter_availability/lib/src/ui/view_models/week_template_view_models.dart b/packages/flutter_availability/lib/src/ui/view_models/week_template_view_models.dart
index 770b0aa..b1b0c2d 100644
--- a/packages/flutter_availability/lib/src/ui/view_models/week_template_view_models.dart
+++ b/packages/flutter_availability/lib/src/ui/view_models/week_template_view_models.dart
@@ -23,12 +23,10 @@ class WeekTemplateViewModel {
       name: template.name,
       color: template.color,
       data: {
-        for (var day in WeekDay.values)
-          day: data.data.containsKey(day)
-              ? DayTemplateDataViewModel.fromDayTemplateData(
-                  data.data[day]!,
-                )
-              : const DayTemplateDataViewModel(),
+        for (var day in WeekDay.values.where(data.data.containsKey))
+          day: DayTemplateDataViewModel.fromDayTemplateData(
+            data.data[day]!,
+          ),
       },
     );
   }