diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html
index fcca79501..766d48690 100644
--- a/src/app/modules/shared/components/details-fields/details-fields.component.html
+++ b/src/app/modules/shared/components/details-fields/details-fields.component.html
@@ -78,7 +78,7 @@
         </div>
       </div>
 
-      <div class="form-group row">
+      <div class="form-group row" >
         <label class="col-12 col-sm-2">Date in:</label>
         <div class="col-12 col-sm-4">
           <input
@@ -107,6 +107,7 @@
             formControlName="start_hour"
             id="start_hour"
             class="timepicker-input"
+            [defaultTime]="'00:00'"
             [class.timepicker-input--disabled]="!(project_id.value && project_name.value)"
           ></ngx-timepicker-field>
         </div>
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts
index 65737d410..731d0d8b6 100644
--- a/src/app/modules/shared/models/entry.model.ts
+++ b/src/app/modules/shared/models/entry.model.ts
@@ -1,7 +1,7 @@
 export interface Entry {
   running?: boolean;
   id?: string;
-  start_date: Date;
+  start_date?: Date;
   end_date?: Date;
   activity_id?: string;
   technologies?: string[];
diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
index c4cf0b699..379a60ef9 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.spec.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
@@ -381,7 +381,7 @@ describe('TimeEntriesComponent', () => {
       uri: 'http://testing.is.fun',
       activity_id: 'sss',
       project_id: 'id',
-      start_date: new Date(new Date().setHours(0, 0, 0, 0)),
+      start_date: component.canMarkEntryAsWIP ? new Date() : new Date(new Date().setHours(0, 0, 0, 0)),
       end_date: new Date(new Date().setHours(0, 0, 0, 0))
     };
     state.timeEntriesDataSource.data = [lastEntry];
diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts
index 7c06b05fe..c6b7cf9fe 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.ts
@@ -129,7 +129,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
           uri: dataToUse.uri ? dataToUse.uri : '',
           activity_id: dataToUse.activity_id,
           project_id: dataToUse.project_id,
-          start_date: startDate,
+          start_date: this.canMarkEntryAsWIP ? new Date() : startDate,
           end_date: startDate
         };
         this.entry = entry;