diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 79e99a5..11d0978 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Nothing",
-    "version": "1.8.6"
+    "version": "1.8.7"
   },
   "tauri": {
     "systemTray": {
diff --git a/src/app/_services/time-tracker.service.ts b/src/app/_services/time-tracker.service.ts
index bbfc50e..fd1cb67 100644
--- a/src/app/_services/time-tracker.service.ts
+++ b/src/app/_services/time-tracker.service.ts
@@ -300,11 +300,16 @@ export class TimeTrackerService {
     if (!this.currentRunHistory) return;
 
     if (this.configService.config.enableStopwatch) {
-      if (!this.start || this.resumeOnNext) {
+      if(!this.isActive && this.resumeOnNext) {
         this.resumeOnNext = false;
         this.startStopwatch();
       }
 
+      if(!this.isActive && !this.resumeOnNext) {
+        //Don't start timer if not meant to auto resumes on next.
+        return;
+      }
+
       this.pushSubject.next({
         type: EntryType.ZoneEnter,
         zone: zone,
@@ -330,6 +335,7 @@ export class TimeTrackerService {
         case Resume.Discard:
           this.setCurrentRunHistory(this.createNew(plan.name));
           plan.last_stored_time = this.currentRunHistory!.uuid;
+          this.resumeOnNext = true;
           plan.requestSelfSave();
           break;
       }
diff --git a/src/app/run-stats/run-stats.component.html b/src/app/run-stats/run-stats.component.html
index c0a55e8..d75e60b 100644
--- a/src/app/run-stats/run-stats.component.html
+++ b/src/app/run-stats/run-stats.component.html
@@ -37,8 +37,6 @@
             <td mat-cell *matCellDef="let entry"> {{entry.estimatedTimeSpent}} </td>
         </ng-container>
 
-        
-
         <ng-container  matColumnDef="aggregateFirstEntry">
             <th mat-header-cell *matHeaderCellDef> Time of first entry </th>
             <td mat-cell *matCellDef="let entry"> {{entry.aggregateFirstEntry}} </td>