diff --git a/med_system_app/lib/features/medical_shifts/pages/add_medical_shift_page.dart b/med_system_app/lib/features/medical_shifts/pages/add_medical_shift_page.dart
index 1ec5e39..cfaa974 100644
--- a/med_system_app/lib/features/medical_shifts/pages/add_medical_shift_page.dart
+++ b/med_system_app/lib/features/medical_shifts/pages/add_medical_shift_page.dart
@@ -1,6 +1,5 @@
 import 'package:distrito_medico/core/pages/success/success.page.dart';
 import 'package:distrito_medico/core/utils/navigation_utils.dart';
-import 'package:distrito_medico/core/utils/utils.dart';
 import 'package:distrito_medico/core/widgets/my_app_bar.widget.dart';
 import 'package:distrito_medico/core/widgets/my_button_widget.dart';
 import 'package:distrito_medico/core/widgets/my_date_input.widget.dart';
@@ -86,15 +85,14 @@ class _AddMedicalShiftPageState extends State<AddMedicalShiftPage> {
     _viewModel.reset(); // Reset viewmodel on entry
     _viewModel.loadSuggestions();
     
-    // Set initial date
-    final date = widget.initialDate ?? DateTime.now();
-    String formatted = "${date.day.toString().padLeft(2, '0')}/${date.month.toString().padLeft(2, '0')}/${date.year}";
-    _viewModel.setStartDate(formatted);
-    
-    // Set initial time to current time
-    final now = TimeOfDay.now();
-    String timeFormatted = "${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}";
-    _viewModel.setStartHour(timeFormatted);
+    // Set initial date if provided
+    if (widget.initialDate != null) {
+      // Assuming format needed is String
+      // MyInputDate expects what? It emits normalized string.
+      // But _viewModel.startDate expects String.
+      String formatted = "${widget.initialDate!.day.toString().padLeft(2, '0')}/${widget.initialDate!.month.toString().padLeft(2, '0')}/${widget.initialDate!.year}";
+      _viewModel.setStartDate(formatted);
+    }
   }
 
   List<String> addSpaceToCurrency(List<String> amounts) {
@@ -153,6 +151,7 @@ class _AddMedicalShiftPageState extends State<AddMedicalShiftPage> {
   }
 
   Widget form(BuildContext context) {
+    TimeOfDay? selectedTime;
     return ListView(
       children: [
         SafeArea(
@@ -235,15 +234,11 @@ class _AddMedicalShiftPageState extends State<AddMedicalShiftPage> {
                         const SizedBox(
                           height: 15,
                         ),
-                        Observer(builder: (_) {
-                          return MyInputTime(
-                            key: ValueKey(_viewModel.startHour),
+                        MyInputTime(
                             label: 'Hora início',
-                            selectedTime: stringToTimeOfDay(_viewModel.startHour),
+                            selectedTime: selectedTime,
                             onChanged: _viewModel.setStartHour,
-                            textColor: Theme.of(context).colorScheme.primary,
-                          );
-                        }),
+                            textColor: Theme.of(context).colorScheme.primary),
                         const SizedBox(
                           height: 15,
                         ),
diff --git a/med_system_app/lib/features/medical_shifts/presentation/viewmodels/create_medical_shift_viewmodel.dart b/med_system_app/lib/features/medical_shifts/presentation/viewmodels/create_medical_shift_viewmodel.dart
index 0af7e97..09a2e3f 100644
--- a/med_system_app/lib/features/medical_shifts/presentation/viewmodels/create_medical_shift_viewmodel.dart
+++ b/med_system_app/lib/features/medical_shifts/presentation/viewmodels/create_medical_shift_viewmodel.dart
@@ -29,7 +29,7 @@ abstract class _CreateMedicalShiftViewModelBase with Store {
   String hospitalName = '';
 
   @observable
-  String workload = 'six';
+  String workload = '';
 
   @observable
   String startDate = '';