diff --git a/app/Livewire/Server/Proxy.php b/app/Livewire/Server/Proxy.php
index 9332c2517..1cf8c839e 100644
--- a/app/Livewire/Server/Proxy.php
+++ b/app/Livewire/Server/Proxy.php
@@ -19,7 +19,15 @@ class Proxy extends Component
 
     public ?string $redirect_url = null;
 
-    protected $listeners = ['saveConfiguration' => 'submit'];
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+
+        return [
+            'saveConfiguration' => 'submit',
+            "echo-private:team.{$teamId},ProxyStatusChangedUI" => '$refresh',
+        ];
+    }
 
     protected $rules = [
         'server.settings.generate_exact_labels' => 'required|boolean',
diff --git a/resources/views/components/status/index.blade.php b/resources/views/components/status/index.blade.php
index fe9569c8a..65beace65 100644
--- a/resources/views/components/status/index.blade.php
+++ b/resources/views/components/status/index.blade.php
@@ -13,11 +13,18 @@
     <x-status.stopped :status="$resource->status" />
 @endif
 @if (!str($resource->status)->contains('exited') && $showRefreshButton)
-    <button title="Refresh Status" wire:click='checkStatus'
+    <button wire:loading.remove title="Refresh Status" wire:click='checkStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
         </svg>
     </button>
+    <button wire:loading title="Refreshing Status" wire:click='checkStatus'
+        class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
+        <svg class="w-4 h-4 animate-spin" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+            <path
+                d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
+        </svg>
+    </button>
 @endif
diff --git a/resources/views/components/status/services.blade.php b/resources/views/components/status/services.blade.php
index 557fbfbfe..677cc6f45 100644
--- a/resources/views/components/status/services.blade.php
+++ b/resources/views/components/status/services.blade.php
@@ -10,11 +10,18 @@
     <x-status.stopped :status="$complexStatus" />
 @endif
 @if (!str($complexStatus)->contains('exited') && $showRefreshButton)
-    <button title="Refresh Status" wire:click='checkStatus'
+    <button wire:loading.remove title="Refresh Status" wire:click='checkStatus'
         class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
         </svg>
     </button>
+    <button wire:loading title="Refreshing Status" wire:click='checkStatus'
+        class="mx-1 dark:hover:fill-white fill-black dark:fill-warning">
+        <svg class="w-4 h-4 animate-spin" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+            <path
+                d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />
+        </svg>
+    </button>
 @endif