diff --git a/app/Http/Livewire/Server/Proxy/Deploy.php b/app/Http/Livewire/Server/Proxy/Deploy.php
index 74e75a071..6ca4bca4b 100644
--- a/app/Http/Livewire/Server/Proxy/Deploy.php
+++ b/app/Http/Livewire/Server/Proxy/Deploy.php
@@ -11,18 +11,13 @@ class Deploy extends Component
 {
     public Server $server;
     public $proxy_settings = null;
-    protected $listeners = ['proxyStatusUpdated'];
-    public function proxyStatusUpdated()
-    {
-        $this->server->refresh();
-    }
     public function start_proxy()
     {
         if (
             $this->server->proxy->last_applied_settings &&
             $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
         ) {
-            $this->saveConfiguration($this->server);
+            $this->emit('saveConfiguration', $server);
         }
         $activity = resolve(StartProxy::class)($this->server);
         $this->emit('newMonitorActivity', $activity->id);
@@ -36,8 +31,4 @@ class Deploy extends Component
         $this->server->save();
         $this->emit('proxyStatusUpdated');
     }
-    private function saveConfiguration(Server $server)
-    {
-        $this->emit('saveConfiguration', $server);
-    }
-}
+}
\ No newline at end of file
diff --git a/app/Http/Livewire/Server/Proxy/Status.php b/app/Http/Livewire/Server/Proxy/Status.php
index 068402b9e..8791e9cc4 100644
--- a/app/Http/Livewire/Server/Proxy/Status.php
+++ b/app/Http/Livewire/Server/Proxy/Status.php
@@ -9,20 +9,12 @@ use Livewire\Component;
 class Status extends Component
 {
     public Server $server;
-    protected $listeners = ['proxyStatusUpdated'];
-    public function proxyStatusUpdated()
-    {
-        $this->server->refresh();
-    }
     public function get_status()
     {
-        try {
-            dispatch_sync(new ProxyContainerStatusJob(
-                server: $this->server
-            ));
-            $this->emit('proxyStatusUpdated');
-        } catch (\Exception $e) {
-            ray($e->getMessage());
-        }
+        dispatch_sync(new ProxyContainerStatusJob(
+            server: $this->server
+        ));
+        $this->server->refresh();
+        $this->emit('proxyStatusUpdated');
     }
 }
\ No newline at end of file
diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index f96d3905e..499568b1a 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -1,5 +1,8 @@
 <div class="pb-6">
-    <h1>Server</h1>
+    <div class="flex items-center gap-2">
+        <h1>Server</h1>
+        <livewire:server.proxy.status :server="$server" />
+    </div>
     <div class="pt-2 pb-10 ">{{ data_get($server, 'name') }}</div>
     <nav class="navbar-main">
         <a class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
@@ -26,9 +29,7 @@
             ]) }}">
             <button>Destinations</button>
         </a>
-        @if (request()->routeIs('server.proxy'))
-            <div class="flex-1"></div>
-            <livewire:server.proxy.deploy :server="$server" />
-        @endif
+        <div class="flex-1"></div>
+        <livewire:server.proxy.deploy :server="$server" />
     </nav>
 </div>
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php
index 08a98c064..b108baab2 100644
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@@ -1,5 +1,8 @@
+@props([
+    'text' => 'Stopped',
+])
 <x-loading wire:loading.delay />
-<div class="flex items-center gap-2 " wire:loading.remove.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">Stopped</div>
+    <div class="text-xs font-medium tracking-wide text-error">{{ $text }}</div>
 </div>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 952817201..f3c059e01 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -1,5 +1,8 @@
+@props([
+    'text' => 'Running',
+])
 <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">Running</div>
+    <div class="text-xs font-medium tracking-wide text-success">{{ $text }}</div>
 </div>
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php
index 23d797271..9867e22a1 100644
--- a/resources/views/components/status/stopped.blade.php
+++ b/resources/views/components/status/stopped.blade.php
@@ -1,5 +1,8 @@
+@props([
+    'text' => 'Stopped',
+])
 <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">Stopped</div>
+    <div class="text-xs font-medium tracking-wide text-error">{{ $text }}</div>
 </div>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 11b277663..3ed9cdca6 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -10,7 +10,6 @@
                             @if ($server->proxy->status === 'exited')
                                 <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
                             @endif
-                            <livewire:server.proxy.status :server="$server" />
                         </div>
                         <div class="pt-3 pb-4 ">Traefik v2</div>
                         @if (
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php
index 032c534c6..41fef8efc 100644
--- a/resources/views/livewire/server/proxy/status.blade.php
+++ b/resources/views/livewire/server/proxy/status.blade.php
@@ -1,9 +1,9 @@
-<div wire:poll.10000ms="get_status" x-init="$wire.get_status">
+<div wire:poll.3000ms="get_status" x-init="$wire.get_status">
     @if ($server->proxy->status === 'running')
-        <x-status.running />
+        <x-status.running text="Proxy Running" />
     @elseif ($server->proxy->status === 'restarting')
-        <x-status.restarting />
+        <x-status.restarting text="Proxy Restarting" />
     @else
-        <x-status.stopped />
+        <x-status.stopped text="Proxy Stopped" />
     @endif
 </div>
diff --git a/routes/web.php b/routes/web.php
index 7620c58ee..18d57474b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,7 +67,7 @@ Route::middleware(['auth'])->group(function () {
         'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
     ]))->name('server.create');
     Route::get('/server/{server_uuid}', fn () => view('server.show', [
-        'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user'])->whereUuid(request()->server_uuid)->firstOrFail(),
+        'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(),
     ]))->name('server.show');
     Route::get('/server/{server_uuid}/proxy', fn () => view('server.proxy', [
         'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(),
@@ -77,7 +77,7 @@ Route::middleware(['auth'])->group(function () {
         'privateKeys' => PrivateKey::ownedByCurrentTeam()->get(),
     ]))->name('server.private-key');
     Route::get('/server/{server_uuid}/destinations', fn () => view('server.destinations', [
-        'server' => Server::ownedByCurrentTeam(['name'])->whereUuid(request()->server_uuid)->firstOrFail()
+        'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail()
     ]))->name('server.destinations');
 });