diff --git a/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart b/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
index be86d1c..8b1f9d3 100644
--- a/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
+++ b/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
@@ -55,11 +55,7 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
   void initState() {
     super.initState();
 
-    for (int i = 0; i < 12 + 1; i++) {
-      String twoDigitNumber = i.toString().padLeft(2, '0');
-      _timeH.add(twoDigitNumber);
-    }
-    for (int i = 1; i < 11 + 1; i++) {
+    for (int i = 0; i < 12; i++) {
       String twoDigitNumber = i.toString().padLeft(2, '0');
       _timeH.add(twoDigitNumber);
     }
@@ -82,16 +78,16 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
     switch (selectedTime.meridiem) {
       case Meridiem.AM:
         _selectedMeridiemIndex = 0;
-        _selectedHourIndex = int.parse(selectedTime.hour) - 1;
 
         break;
 
       case Meridiem.PM:
         _selectedMeridiemIndex = 1;
-        _selectedHourIndex = (int.parse(selectedTime.hour) + 12) - 1;
 
         break;
     }
+    _selectedHourIndex = int.parse(selectedTime.hour);
+
     _selectedMinuteIndex = int.parse(selectedTime.minute);
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _scrollList(_meridiemScrollController, _selectedMeridiemIndex);
@@ -120,17 +116,17 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
     switch (type) {
       case SelectorType.meridiem:
         _selectedMeridiemIndex = index; // if month is changed to february &
-        if (_selectedMeridiemIndex == 0) {
-          if (_selectedHourIndex > 12 - 1) {
-            _selectedHourIndex -= 12;
-            _hourScrollController.jumpToItem(_selectedHourIndex);
-          }
-        } else {
-          if (_selectedHourIndex < 12 - 1) {
-            _selectedHourIndex += 12;
-            _hourScrollController.jumpToItem(_selectedHourIndex);
-          }
-        }
+        // if (_selectedMeridiemIndex == 0) {
+        //   if (_selectedHourIndex > 12 - 1) {
+        //     _selectedHourIndex -= 12;
+        //     _hourScrollController.jumpToItem(_selectedHourIndex);
+        //   }
+        // } else {
+        //   if (_selectedHourIndex < 12 - 1) {
+        //     _selectedHourIndex += 12;
+        //     _hourScrollController.jumpToItem(_selectedHourIndex);
+        //   }
+        // }
         if (index == 0) {
           selectedTime.meridiem = Meridiem.AM;
         } else {
@@ -140,13 +136,13 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
 
       case SelectorType.hour:
         _selectedHourIndex = index; // if month is changed to february &
-        if (_selectedHourIndex > 12 - 1) {
-          _selectedMeridiemIndex = 1;
-          _meridiemScrollController.jumpToItem(_selectedMeridiemIndex);
-        } else {
-          _selectedMeridiemIndex = 0;
-          _meridiemScrollController.jumpToItem(_selectedMeridiemIndex);
-        }
+        // if (_selectedHourIndex > 12 - 1) {
+        //   _selectedMeridiemIndex = 1;
+        //   _meridiemScrollController.jumpToItem(_selectedMeridiemIndex);
+        // } else {
+        //   _selectedMeridiemIndex = 0;
+        //   _meridiemScrollController.jumpToItem(_selectedMeridiemIndex);
+        // }
         selectedTime.hour = _timeH[index];
 
         break;