diff --git a/app/Actions/Proxy/CheckProxy.php b/app/Actions/Proxy/CheckProxy.php
index cf0f6015c..03a0beddf 100644
--- a/app/Actions/Proxy/CheckProxy.php
+++ b/app/Actions/Proxy/CheckProxy.php
@@ -2,14 +2,17 @@
 
 namespace App\Actions\Proxy;
 
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
 
 class CheckProxy
 {
     use AsAction;
 
-    public function handle(Server $server, $fromUI = false)
+    // It should return if the proxy should be started (true) or not (false)
+    public function handle(Server $server, $fromUI = false): bool
     {
         if (! $server->isFunctional()) {
             return false;
@@ -62,22 +65,42 @@ class CheckProxy
                 $ip = 'host.docker.internal';
             }
 
-            $connection80 = @fsockopen($ip, '80');
-            $connection443 = @fsockopen($ip, '443');
-            $port80 = is_resource($connection80) && fclose($connection80);
-            $port443 = is_resource($connection443) && fclose($connection443);
-            if ($port80) {
-                if ($fromUI) {
-                    throw new \Exception("Port 80 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a><br>Discord: <a target='_blank' href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+            $portsToCheck = ['80', '443'];
+
+            try {
+                if ($server->proxyType() !== ProxyTypes::NONE->value) {
+                    $proxyCompose = CheckConfiguration::run($server);
+                    if (isset($proxyCompose)) {
+                        $yaml = Yaml::parse($proxyCompose);
+                        $portsToCheck = [];
+                        if ($server->proxyType() === ProxyTypes::TRAEFIK->value) {
+                            $ports = data_get($yaml, 'services.traefik.ports');
+                        } elseif ($server->proxyType() === ProxyTypes::CADDY->value) {
+                            $ports = data_get($yaml, 'services.caddy.ports');
+                        }
+                        if (isset($ports)) {
+                            foreach ($ports as $port) {
+                                $portsToCheck[] = str($port)->before(':')->value();
+                            }
+                        }
+                    }
                 } else {
-                    return false;
+                    $portsToCheck = [];
                 }
+            } catch (\Exception $e) {
+                ray($e->getMessage());
             }
-            if ($port443) {
-                if ($fromUI) {
-                    throw new \Exception("Port 443 is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a><br>Discord: <a target='_blank' href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
-                } else {
-                    return false;
+            if (count($portsToCheck) === 0) {
+                return false;
+            }
+            foreach ($portsToCheck as $port) {
+                $connection = @fsockopen($ip, $port);
+                if (is_resource($connection) && fclose($connection)) {
+                    if ($fromUI) {
+                        throw new \Exception("Port $port is in use.<br>You must stop the process using this port.<br>Docs: <a target='_blank' href='https://coolify.io/docs'>https://coolify.io/docs</a><br>Discord: <a target='_blank' href='https://coollabs.io/discord'>https://coollabs.io/discord</a>");
+                    } else {
+                        return false;
+                    }
                 }
             }
 
diff --git a/app/Livewire/Server/Proxy/Status.php b/app/Livewire/Server/Proxy/Status.php
index 20db4dad4..f4f18381f 100644
--- a/app/Livewire/Server/Proxy/Status.php
+++ b/app/Livewire/Server/Proxy/Status.php
@@ -4,7 +4,7 @@ namespace App\Livewire\Server\Proxy;
 
 use App\Actions\Docker\GetContainersStatus;
 use App\Actions\Proxy\CheckProxy;
-use App\Jobs\ContainerStatusJob;
+use App\Actions\Proxy\StartProxy;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -44,7 +44,10 @@ class Status extends Component
                 }
                 $this->numberOfPolls++;
             }
-            CheckProxy::run($this->server, true);
+            $shouldStart = CheckProxy::run($this->server, true);
+            if ($shouldStart) {
+                StartProxy::run($this->server, false);
+            }
             $this->dispatch('proxyStatusUpdated');
             if ($this->server->proxy->status === 'running') {
                 $this->polling = false;
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php
index fc10a0a75..c9b6c2127 100644
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@@ -2,9 +2,12 @@
     'status' => 'Restarting',
     'lastDeploymentInfo' => null,
     'lastDeploymentLink' => null,
+    'noLoading' => false,
 ])
 <div class="flex items-center">
-    <x-loading wire:loading.delay.longer />
+    @if (!$noLoading)
+        <x-loading wire:loading.delay.longer />
+    @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-warning "></div>
         <div class="pl-2 pr-1 text-xs font-bold tracking-wider dark:text-warning" @if($lastDeploymentInfo) title="{{$lastDeploymentInfo}}" @endif>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 2e0907a2a..8bb45b884 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -2,9 +2,12 @@
     'status' => 'Running',
     'lastDeploymentInfo' => null,
     'lastDeploymentLink' => null,
+    'noLoading' => false,
 ])
 <div class="flex items-center">
-    <x-loading wire:loading.delay.longer />
+    @if (!$noLoading)
+        <x-loading wire:loading.delay.longer />
+    @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
     <div class="badge badge-success "></div>
     <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success" @if($lastDeploymentInfo) title="{{$lastDeploymentInfo}}" @endif>
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php
index f168fb3c2..63bc2399d 100644
--- a/resources/views/components/status/stopped.blade.php
+++ b/resources/views/components/status/stopped.blade.php
@@ -1,8 +1,11 @@
 @props([
     'status' => 'Stopped',
+    'noLoading' => false,
 ])
 <div class="flex items-center">
-    <x-loading wire:loading.delay.longer />
+    @if (!$noLoading)
+        <x-loading wire:loading.delay.longer />
+    @endif
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-error "></div>
         <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-error">{{ str($status)->before(':')->headline() }}</div>
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php
index 621e0bc8c..4dce706e8 100644
--- a/resources/views/livewire/server/proxy/status.blade.php
+++ b/resources/views/livewire/server/proxy/status.blade.php
@@ -1,14 +1,14 @@
 <div x-init="$wire.checkProxy()" class="flex gap-2">
     @if (data_get($server, 'proxy.status') === 'running')
-        <x-status.running status="Proxy Running" />
+        <x-status.running status="Proxy Running" noLoading />
     @elseif (data_get($server, 'proxy.status') === 'restarting')
-        <x-status.restarting status="Proxy Restarting" />
+        <x-status.restarting status="Proxy Restarting" noLoading />
     @elseif (data_get($server, 'proxy.force_stop'))
-        <x-status.stopped status="Proxy Stopped" />
+        <x-status.stopped status="Proxy Stopped" noLoading />
     @elseif (data_get($server, 'proxy.status') === 'exited')
-        <x-status.stopped status="Proxy Exited" />
+        <x-status.stopped status="Proxy Exited" noLoading />
     @else
-        <x-status.stopped status="Proxy Not Running" />
+        <x-status.stopped status="Proxy Not Running" noLoading />
     @endif
     <x-forms.button wire:click='checkProxy(true)'>Refresh</x-forms.button>
 </div>