diff --git a/lib/app/pages/daily/daily_page.dart b/lib/app/pages/daily/daily_page.dart
index d6eeccd..2907298 100644
--- a/lib/app/pages/daily/daily_page.dart
+++ b/lib/app/pages/daily/daily_page.dart
@@ -24,7 +24,9 @@ class _DailyPageState extends BaseState<DailyPage, DailyController> {
   @override
   void onReady() async {
     await controller.loadSemestre();
-    list = controller.state.semestres[0].disciplinas;
+    if (controller.state.isNow) {
+      list = controller.state.semestres[0].disciplinas;
+    }
   }
 
   @override
@@ -123,6 +125,11 @@ class _DailyPageState extends BaseState<DailyPage, DailyController> {
                   loaded: () => true,
                 ),
                 builder: (context, state) {
+                  if (state.isNow) {
+                    list = state.semestres[0].disciplinas;
+                  } else {
+                    list = state.semestres[state.selected].disciplinas;
+                  }
                   return Expanded(
                     child: ListView.builder(
                       shrinkWrap: true,
diff --git a/lib/app/pages/daily/widgets/my_switch.dart b/lib/app/pages/daily/widgets/my_switch.dart
index b21287a..faa0fb0 100644
--- a/lib/app/pages/daily/widgets/my_switch.dart
+++ b/lib/app/pages/daily/widgets/my_switch.dart
@@ -7,7 +7,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class MySwitch extends StatefulWidget {
-  const MySwitch({super.key});
+  const MySwitch({
+    super.key,
+  });
 
   @override
   State<MySwitch> createState() => _MySwitchState();
@@ -31,9 +33,7 @@ class _MySwitchState extends State<MySwitch> {
                 borderRadius: BorderRadius.circular(5),
               ),
               child: TextButton(
-                onPressed: () {
-                  context.read<DailyController>().changeIsNow();
-                },
+                onPressed: () => context.read<DailyController>().changeIsNow(),
                 child: Text(
                   'Diário atual',
                   style: TextStyles.instance.texLabelH2.copyWith(
diff --git a/lib/app/pages/schedule/schedule_state.dart b/lib/app/pages/schedule/schedule_state.dart
index b188e2b..41569a4 100644
--- a/lib/app/pages/schedule/schedule_state.dart
+++ b/lib/app/pages/schedule/schedule_state.dart
@@ -32,7 +32,7 @@ class ScheduleState extends Equatable {
       : status = ScheduleStatus.initial,
         schedule = <Horario>[],
         errorMessage = null,
-        selectedDay = DateTime.now().weekday - 1;
+        selectedDay = DateTime.now().weekday;
 
   @override
   List<Object?> get props => [status, schedule, errorMessage, selectedDay];