diff --git a/resources/views/components/status/degraded.blade.php b/resources/views/components/status/degraded.blade.php
index cd9133600..81beedfa7 100644
--- a/resources/views/components/status/degraded.blade.php
+++ b/resources/views/components/status/degraded.blade.php
@@ -1,7 +1,7 @@
 @props([
     'status' => 'Degraded',
 ])
-{{-- <x-loading wire:loading.delay /> --}}
+<x-loading wire:loading.delay.longer />
 <div class="flex items-center gap-2" wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
     <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php
index 807c10202..a59f59aa8 100644
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@@ -1,7 +1,7 @@
 @props([
     'status' => 'Restarting',
 ])
-{{-- <x-loading wire:loading.delay /> --}}
+<x-loading wire:loading.delay.longer />
 <div class="flex items-center gap-2" wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
     <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 015c1b18e..5fffde9c0 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -1,7 +1,7 @@
 @props([
     'status' => 'Running',
 ])
-{{-- <x-loading wire:loading.delay.longer /> --}}
+<x-loading wire:loading.delay.longer />
 <div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
     <div class="badge badge-success badge-xs"></div>
     <div class="text-xs font-medium tracking-wide text-success">{{ Str::headline($status) }}</div>
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php
index f2e15202e..de94fa074 100644
--- a/resources/views/components/status/stopped.blade.php
+++ b/resources/views/components/status/stopped.blade.php
@@ -1,7 +1,7 @@
 @props([
     'status' => 'Stopped',
 ])
-{{-- <x-loading wire:loading.delay.longer /> --}}
+<x-loading wire:loading.delay.longer />
 <div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
     <div class="badge badge-error badge-xs"></div>
     <div class="text-xs font-medium tracking-wide text-error">{{ Str::headline($status) }}</div>
diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index 302f4f2d7..ea9d2028a 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -1,7 +1,7 @@
-<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus">
+<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus" wire:poll.10000ms="checkStatus">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
     <livewire:project.service.compose-modal :service="$service" />
-    <div class="flex h-full pt-6" wire:poll.10000ms="checkStatus">
+    <div class="flex h-full pt-6" >
         <div class="flex flex-col items-start gap-4 min-w-fit">
             <a target="_blank" href="{{ $service->documentation() }}">Documentation <x-external-link /></a>
             <a :class="activeTab === 'service-stack' && 'text-white'"