diff --git a/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart b/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart
index 0e1efb8..d19fbdf 100755
--- a/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart
+++ b/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart
@@ -476,7 +476,9 @@ class TimetablePageState extends State<TimetablePage>
 
                                           return Column(
                                             children: [
-                                              if (before != null)
+                                              if (before != null &&
+                                                  (before.end.hour != 0 &&
+                                                      lesson.start.hour != 0))
                                                 Padding(
                                                   padding: EdgeInsets.only(
                                                       top: index == 0
@@ -546,7 +548,8 @@ class TimetablePageState extends State<TimetablePage>
                                                               width: 10.0,
                                                             ),
                                                             Text(
-                                                              '${before.end.hour}:${before.end.minute} - ${lesson.start.hour}:${lesson.start.minute}',
+                                                              '${DateFormat("hh:mm", I18n.of(context).locale.languageCode).format(before.end)} - ${DateFormat("hh:mm", I18n.of(context).locale.languageCode).format(lesson.start)}',
+                                                              // '${before.end.hour}:${before.end.minute} - ${lesson.start.hour}:${lesson.start.minute}',
                                                               style:
                                                                   const TextStyle(
                                                                 fontSize: 12.5,