diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.php
index 7a96eabb2..98730e1a4 100644
--- a/app/Livewire/Settings/Index.php
+++ b/app/Livewire/Settings/Index.php
@@ -80,7 +80,7 @@ public function timezones(): array
     public function instantSave($isSave = true)
     {
         $this->validate();
-        $this->settings->fqdn = $this->fqdn;
+        $this->settings->fqdn = $this->fqdn ? trim($this->fqdn) : $this->fqdn;
         $this->settings->public_port_min = $this->public_port_min;
         $this->settings->public_port_max = $this->public_port_max;
         $this->settings->instance_name = $this->instance_name;
@@ -121,6 +121,11 @@ public function submit()
             }
             $this->validate();
 
+            // Trim FQDN to remove leading/trailing whitespace
+            if ($this->fqdn) {
+                $this->fqdn = trim($this->fqdn);
+            }
+
             if ($this->settings->is_dns_validation_enabled && $this->fqdn) {
                 if (! validateDNSEntry($this->fqdn, $this->server)) {
                     $this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");