diff --git a/resources/views/tasks/create.blade.php b/resources/views/tasks/create.blade.php
index a1490833..f8681ff1 100755
--- a/resources/views/tasks/create.blade.php
+++ b/resources/views/tasks/create.blade.php
@@ -53,11 +53,12 @@ if (isset($task)) {
                 <div class="ui-form-field">
                     <label for="start_date">تاریخ شروع <span class="text-red-500">*</span></label>
                     @php
-                        $defaultStartGregorian = !empty($task?->start_date)
-                            ? \App\Support\JalaliHelper::toGregorianDate($task->start_date)
+                        $existingStart = isset($task) && !empty($task->start_date) ? $task->start_date : null;
+                        $defaultStartGregorian = $existingStart
+                            ? \App\Support\JalaliHelper::toGregorianDate($existingStart)
                             : now()->format('Y-m-d');
-                        $defaultStartJalali = !empty($task?->start_date)
-                            ? \App\Support\JalaliHelper::format($task->start_date, 'Y/m/d', '')
+                        $defaultStartJalali = $existingStart
+                            ? \App\Support\JalaliHelper::format($existingStart, 'Y/m/d', '')
                             : \App\Support\JalaliHelper::format(now(), 'Y/m/d', '');
                     @endphp
                     <input type="text" id="start_date" name="start_date_display" class="ui-input"
@@ -253,24 +254,17 @@ if (isset($task)) {
                 }
             });
 
-            // اگر مقدار اولیه از دیتابیس آمده، فیلد مخفی میلادی را هم پر کن
-            @if(!empty($task?->start_date))
+            // اگر تسک موجود برای ویرایش است، تاریخ‌ها را از دیتابیس ست کن
+            @if(!empty($task) && !empty($task->start_date))
                 $('#start_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->start_date)));
                 $('#start_date').val(@json(\App\Support\JalaliHelper::format($task->start_date, 'Y/m/d', '')));
-            @elseif(!$('#start_date_gregorian').val())
-                // پیش‌فرض: امروز
-                const todayUnix = new persianDate().valueOf();
-                const todayJalali = new persianDate(todayUnix).format('YYYY/MM/DD');
-                const todayGregorian = new persianDate(todayUnix).toCalendar('gregorian').toLocale('en').format('YYYY-MM-DD');
-                $('#start_date').val(todayJalali);
-                $('#start_date_gregorian').val(todayGregorian);
             @endif
-            @if(!empty($task?->target_date))
+            @if(!empty($task) && !empty($task->target_date))
                 $('#target_date_gregorian').val(@json(\App\Support\JalaliHelper::toGregorianDate($task->target_date)));
                 $('#target_date').val(@json(\App\Support\JalaliHelper::format($task->target_date, 'Y/m/d', '')));
             @endif
 
-            $('form').on('submit', function (e) {
+            $('form').on('submit', function () {
                 syncGregorianFromDisplay('#start_date', '#start_date_gregorian');
                 syncGregorianFromDisplay('#target_date', '#target_date_gregorian');
                 if (!$('#start_date_gregorian').val()) {