diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 25b6ca123309..9d53593e1981 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2603,6 +2603,7 @@ $LANG = array(
     'please_register' => 'Please register your account',
     'processing_request' => 'Processing request',
     'mcrypt_warning' => 'Warning: Mcrypt is deprecated, run <code>php artisan ninja:update-key --legacy=true</code> to update your cipher.',
+    'edit_times' => 'Edit Times',
 
 );
 
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 4deda34d96f8..33a1b3b06ce0 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -72,20 +72,22 @@
                     <label for="simple-time" class="control-label col-lg-4 col-sm-4">
                     </label>
                     <div class="col-lg-8 col-sm-8" style="padding-top: 10px">
-                        <p>{{ $task->getStartTime() }} -
-                        @if (Auth::user()->account->timezone_id)
-                            {{ $timezone }}
-                        @else
-                            {!! link_to('/settings/localization?focus=timezone_id', $timezone, ['target' => '_blank']) !!}
+                        @if ($task->getStartTime())
+                            <p>{{ $task->getStartTime() }} -
+                            @if (Auth::user()->account->timezone_id)
+                                {{ $timezone }}
+                            @else
+                                {!! link_to('/settings/localization?focus=timezone_id', $timezone, ['target' => '_blank']) !!}
+                            @endif
+                            <p/>
                         @endif
-                        <p/>
 
                         @if ($task->hasPreviousDuration())
                             {{ trans('texts.duration') . ': ' . Utils::formatTime($task->getDuration()) }}<br/>
                         @endif
 
                         @if (!$task->is_running)
-                            <p>{!! Button::primary(trans('texts.edit_details'))->withAttributes(['onclick'=>'showTimeDetails()'])->small() !!}</p>
+                            <p>{!! Button::primary(trans('texts.edit_times'))->withAttributes(['onclick'=>'showTimeDetails()'])->small() !!}</p>
                         @endif
                     </div>
                 </div>