diff --git a/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php b/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php
index 0f3ee9332..7d79e790d 100644
--- a/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php
+++ b/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php
@@ -418,4 +418,13 @@ class CreateNode extends CreateRecord
     {
         return [];
     }
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (!$data['behind_proxy']) {
+            $data['daemon_listen'] = $data['daemon_connect'];
+        }
+
+        return $data;
+    }
 }
diff --git a/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php
index 5c382816f..66b375016 100644
--- a/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php
+++ b/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php
@@ -640,6 +640,15 @@ class EditNode extends EditRecord
         ];
     }
 
+    protected function mutateFormDataBeforeSave(array $data): array
+    {
+        if (!$data['behind_proxy']) {
+            $data['daemon_listen'] = $data['daemon_connect'];
+        }
+
+        return $data;
+    }
+
     protected function afterSave(): void
     {
         $this->fillForm();