diff --git a/AUTHORS.md b/AUTHORS.md
index 5d13d4120..c33249f47 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -9,6 +9,7 @@
 * Arun Muralidharan - <https://github.com/arun-muralidharan>
 * Khushbu Bora - <https://github.com/KhushbuBora>
 * Patrick Witter - <https://github.com/patrickwitter>
+* Tomer Ben-Rachel - <https://github.com/tomerpacific>
 * Thilina Herath - <https://github.com/ThilinaTCH>
 
 ## Translators
diff --git a/lib/models/workouts/session.dart b/lib/models/workouts/session.dart
index cdb3f130e..c759dd61d 100644
--- a/lib/models/workouts/session.dart
+++ b/lib/models/workouts/session.dart
@@ -59,6 +59,11 @@ class WorkoutSession {
     required this.timeEnd,
   });
 
+  WorkoutSession.now(){
+    timeStart = TimeOfDay.now();
+    timeEnd = TimeOfDay.now();
+  }
+
   // Boilerplate
   factory WorkoutSession.fromJson(Map<String, dynamic> json) => _$WorkoutSessionFromJson(json);
   Map<String, dynamic> toJson() => _$WorkoutSessionToJson(this);
diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart
index d424b2871..38d75be51 100644
--- a/lib/widgets/workouts/gym_mode.dart
+++ b/lib/widgets/workouts/gym_mode.dart
@@ -713,7 +713,7 @@ class _SessionPageState extends State<SessionPage> {
   final timeStartController = TextEditingController();
   final timeEndController = TextEditingController();
 
-  final _session = WorkoutSession();
+  final _session = WorkoutSession.now();
 
   /// Selected impression: bad, neutral, good
   var selectedImpression = [false, true, false];
@@ -804,11 +804,12 @@ class _SessionPageState extends State<SessionPage> {
                             // Open time picker
                             final pickedTime = await showTimePicker(
                               context: context,
-                              initialTime: widget._start,
+                              initialTime: _session.timeStart,
                             );
 
                             if (pickedTime != null) {
                               timeStartController.text = timeToString(pickedTime)!;
+                              _session.timeStart = pickedTime;
                             }
                           },
                           onSaved: (newValue) {
@@ -836,10 +837,14 @@ class _SessionPageState extends State<SessionPage> {
                           // Open time picker
                           final pickedTime = await showTimePicker(
                             context: context,
-                            initialTime: TimeOfDay.now(),
+                            initialTime: _session.timeEnd,
                           );
 
-                          timeEndController.text = timeToString(pickedTime)!;
+                          if (pickedTime != null) {
+                            timeEndController.text = timeToString(pickedTime)!;
+                            _session.timeEnd = pickedTime;
+                          }
+
                         },
                         onSaved: (newValue) {
                           _session.timeEnd = stringToTime(newValue);