diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index f8e28d216..90f322187 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -153,7 +153,7 @@ class General extends Component
         $this->is_preserve_repository_enabled = $this->application->settings->is_preserve_repository_enabled;
         $this->is_container_label_escape_enabled = $this->application->settings->is_container_label_escape_enabled;
         $this->customLabels = $this->application->parseContainerLabels();
-        if (! $this->customLabels && $this->application->destination->server->proxyType() !== 'NONE' && $this->application->settings->is_container_label_readonly_enabled === true) {
+        if ($this->customLabels && $this->application->destination->server->proxyType() !== 'NONE' && $this->application->settings->is_container_label_readonly_enabled === true) {
             $this->customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
@@ -294,7 +294,7 @@ class General extends Component
     public function resetDefaultLabels($manualReset = false)
     {
         try {
-            if ($this->application->settings->is_container_label_readonly_enabled && ! $manualReset) {
+            if (! $this->application->settings->is_container_label_readonly_enabled && ! $manualReset) {
                 return;
             }
             $this->customLabels = str(implode('|coolify|', generateLabelsApplication($this->application)))->replace('|coolify|', "\n");
@@ -324,6 +324,7 @@ class General extends Component
             }
             check_domain_usage(resource: $this->application);
             $this->application->fqdn = $domains->implode(',');
+            $this->resetDefaultLabels(false);
         }
     }