diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.php
index df04f70d76..f951736512 100644
--- a/app/Livewire/Project/Database/Keydb/General.php
+++ b/app/Livewire/Project/Database/Keydb/General.php
@@ -7,102 +7,136 @@
 use App\Models\Server;
 use App\Models\StandaloneKeydb;
 use Exception;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class General extends Component
 {
-    protected $listeners = ['refresh'];
-
     public Server $server;
 
     public StandaloneKeydb $database;
 
-    public ?string $db_url = null;
-
-    public ?string $db_url_public = null;
-
-    protected $rules = [
-        'database.name' => 'required',
-        'database.description' => 'nullable',
-        'database.keydb_conf' => 'nullable',
-        'database.keydb_password' => 'required',
-        'database.image' => 'required',
-        'database.ports_mappings' => 'nullable',
-        'database.is_public' => 'nullable|boolean',
-        'database.public_port' => 'nullable|integer',
-        'database.is_log_drain_enabled' => 'nullable|boolean',
-        'database.custom_docker_run_options' => 'nullable',
-    ];
-
-    protected $validationAttributes = [
-        'database.name' => 'Name',
-        'database.description' => 'Description',
-        'database.keydb_conf' => 'Redis Configuration',
-        'database.keydb_password' => 'Redis Password',
-        'database.image' => 'Image',
-        'database.ports_mappings' => 'Port Mapping',
-        'database.is_public' => 'Is Public',
-        'database.public_port' => 'Public Port',
-        'database.custom_docker_run_options' => 'Custom Docker Run Options',
-    ];
+    #[Rule(['required', 'string'])]
+    public string $name;
 
-    public function mount()
+    #[Rule(['nullable', 'string'])]
+    public ?string $description = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $keydbConf = null;
+
+    #[Rule(['required', 'string'])]
+    public string $keydbPassword;
+
+    #[Rule(['required', 'string'])]
+    public string $image;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $portsMappings = null;
+
+    #[Rule(['nullable', 'boolean'])]
+    public ?bool $isPublic = null;
+
+    #[Rule(['nullable', 'integer'])]
+    public ?int $publicPort = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $customDockerRunOptions = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $dbUrl = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $dbUrlPublic = null;
+
+    #[Rule(['nullable', 'boolean'])]
+    public bool $isLogDrainEnabled = false;
+
+    public function getListeners()
     {
-        $this->db_url = $this->database->internal_db_url;
-        $this->db_url_public = $this->database->external_db_url;
-        $this->server = data_get($this->database, 'destination.server');
+        $teamId = Auth::user()->currentTeam()->id;
+
+        return [
+            "echo-private:team.{$teamId},DatabaseProxyStopped" => 'databaseProxyStopped',
+        ];
     }
 
-    public function instantSaveAdvanced()
+    public function mount()
     {
         try {
-            if (! $this->server->isLogDrainEnabled()) {
-                $this->database->is_log_drain_enabled = false;
-                $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
+            $this->syncData();
+            $this->server = data_get($this->database, 'destination.server');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
 
-                return;
-            }
+    public function syncData(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->validate();
+            $this->database->name = $this->name;
+            $this->database->description = $this->description;
+            $this->database->keydb_conf = $this->keydbConf;
+            $this->database->keydb_password = $this->keydbPassword;
+            $this->database->image = $this->image;
+            $this->database->ports_mappings = $this->portsMappings;
+            $this->database->is_public = $this->isPublic;
+            $this->database->public_port = $this->publicPort;
+            $this->database->custom_docker_run_options = $this->customDockerRunOptions;
+            $this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
             $this->database->save();
-            $this->dispatch('success', 'Database updated.');
-            $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
-        } catch (Exception $e) {
-            return handleError($e, $this);
+
+            $this->dbUrl = $this->database->internal_db_url;
+            $this->dbUrlPublic = $this->database->external_db_url;
+        } else {
+            $this->name = $this->database->name;
+            $this->description = $this->database->description;
+            $this->keydbConf = $this->database->keydb_conf;
+            $this->keydbPassword = $this->database->keydb_password;
+            $this->image = $this->database->image;
+            $this->portsMappings = $this->database->ports_mappings;
+            $this->isPublic = $this->database->is_public;
+            $this->publicPort = $this->database->public_port;
+            $this->customDockerRunOptions = $this->database->custom_docker_run_options;
+            $this->isLogDrainEnabled = $this->database->is_log_drain_enabled;
+            $this->dbUrl = $this->database->internal_db_url;
+            $this->dbUrlPublic = $this->database->external_db_url;
         }
     }
 
-    public function submit()
+    public function instantSaveAdvanced()
     {
         try {
-            $this->validate();
-            if ($this->database->keydb_conf === '') {
-                $this->database->keydb_conf = null;
+            if (! $this->server->isLogDrainEnabled()) {
+                $this->isLogDrainEnabled = false;
+                $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
+
+                return;
             }
-            $this->database->save();
+            $this->syncData(true);
+
             $this->dispatch('success', 'Database updated.');
+            $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
         } catch (Exception $e) {
             return handleError($e, $this);
-        } finally {
-            if (is_null($this->database->config_hash)) {
-                $this->database->isConfigurationChanged(true);
-            } else {
-                $this->dispatch('configurationChanged');
-            }
         }
     }
 
     public function instantSave()
     {
         try {
-            if ($this->database->is_public && ! $this->database->public_port) {
+            if ($this->isPublic && ! $this->publicPort) {
                 $this->dispatch('error', 'Public port is required.');
-                $this->database->is_public = false;
+                $this->isPublic = false;
 
                 return;
             }
-            if ($this->database->is_public) {
+            if ($this->isPublic) {
                 if (! str($this->database->status)->startsWith('running')) {
                     $this->dispatch('error', 'Database must be started to be publicly accessible.');
-                    $this->database->is_public = false;
+                    $this->isPublic = false;
 
                     return;
                 }
@@ -112,22 +146,37 @@ public function instantSave()
                 StopDatabaseProxy::run($this->database);
                 $this->dispatch('success', 'Database is no longer publicly accessible.');
             }
-            $this->db_url_public = $this->database->external_db_url;
-            $this->database->save();
+            $this->dbUrlPublic = $this->database->external_db_url;
+            $this->syncData(true);
         } catch (\Throwable $e) {
-            $this->database->is_public = ! $this->database->is_public;
+            $this->isPublic = ! $this->isPublic;
+            $this->syncData(true);
 
             return handleError($e, $this);
         }
     }
 
-    public function refresh(): void
+    public function databaseProxyStopped()
     {
-        $this->database->refresh();
+        $this->syncData();
     }
 
-    public function render()
+    public function submit()
     {
-        return view('livewire.project.database.keydb.general');
+        try {
+            if (str($this->publicPort)->isEmpty()) {
+                $this->publicPort = null;
+            }
+            $this->syncData(true);
+            $this->dispatch('success', 'Database updated.');
+        } catch (Exception $e) {
+            return handleError($e, $this);
+        } finally {
+            if (is_null($this->database->config_hash)) {
+                $this->database->isConfigurationChanged(true);
+            } else {
+                $this->dispatch('configurationChanged');
+            }
+        }
     }
 }