diff --git a/resources/views/livewire/project/application/deployment/index.blade.php b/resources/views/livewire/project/application/deployment/index.blade.php
index 41b11dc3b..a44c627af 100644
--- a/resources/views/livewire/project/application/deployment/index.blade.php
+++ b/resources/views/livewire/project/application/deployment/index.blade.php
@@ -93,10 +93,11 @@
                     <div>
                         @if ($deployment->status !== 'in_progress')
                             Finished <span x-text="measure_since_started()">0s</span> in
+                            <span class="font-bold" x-text="measure_finished_time()">0s</span>
                         @else
                             Running for
                         @endif
-                        <span class="font-bold" x-text="measure_finished_time()">0s</span>
+                        <span class="font-bold" x-text="measure_since_started()">0s</span>
                     </div>
                 </div>
             </div>
@@ -118,11 +119,31 @@
                 dayjs.extend(window.dayjs_plugin_relativeTime);
 
                 Alpine.data('elapsedTime', (uuid, status, created_at, updated_at) => ({
-                    finished_time: 'calculating...',
-                    started_time: 'calculating...',
-                    init() {
-                        if (timers[uuid]) {
-                            clearInterval(timers[uuid]);
+                        finished_time: 'calculating...',
+                        started_time: 'calculating...',
+                        init() {
+                            if (timers[uuid]) {
+                                clearInterval(timers[uuid]);
+                            }
+                            if (status === 'in_progress') {
+                                timers[uuid] = setInterval(() => {
+                                    this.finished_time = dayjs().diff(dayjs.utc(created_at),
+                                        'second') + 's'
+                                }, 1000);
+                            } else {
+                                let seconds = dayjs.utc(updated_at).diff(dayjs.utc(created_at), 'second')
+                                this.finished_time = seconds + 's';
+                            }
+                        },
+                        measure_finished_time() {
+                            if (this.finished_time > 2000) {
+                                return 0;
+                            } else {
+                                return this.finished_time;
+                            }
+                        },
+                        measure_since_started() {
+                            return dayjs.utc(created_at).fromNow();
                         }
                         if (status === 'in_progress') {
                             timers[uuid] = setInterval(() => {