diff --git a/package.json b/package.json
index 34a467c..2a698e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomodoro-logger",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Pomodoro Logger -- When a time logger meets Pomodoro and Kanban board",
   "main": "./dist/main.js",
   "scripts": {
diff --git a/src/renderer/components/Timer/Timer.tsx b/src/renderer/components/Timer/Timer.tsx
index fe39fb6..6b7fdcb 100644
--- a/src/renderer/components/Timer/Timer.tsx
+++ b/src/renderer/components/Timer/Timer.tsx
@@ -533,11 +533,11 @@ class Timer extends Component<Props, State> {
             this.monitor = undefined;
         }
 
-        this.setState({ pomodoroNum: this.state.pomodoroNum + 1 });
         if (this.stagedSession === undefined) {
             // Resting session
             await this.props.timerFinished();
         } else {
+            this.setState({ pomodoroNum: this.state.pomodoroNum + 1 });
             this.stagedSession.spentTimeInHour += this.extendedTimeInMinute / 60;
             this.extendedTimeInMinute = 0;
             if (this.props.timer.boardId !== undefined) {