diff --git a/app/Livewire/SettingsBackup.php b/app/Livewire/SettingsBackup.php
index 73e106688..99b8f8d49 100644
--- a/app/Livewire/SettingsBackup.php
+++ b/app/Livewire/SettingsBackup.php
@@ -16,7 +16,7 @@ class SettingsBackup extends Component
 
     public $s3s;
 
-    public StandalonePostgresql|null|array $database = [];
+    public ?StandalonePostgresql $database = null;
 
     public ScheduledDatabaseBackup|null|array $backup = [];
 
@@ -43,26 +43,19 @@ class SettingsBackup extends Component
     {
         if (isInstanceAdmin()) {
             $settings = InstanceSettings::get();
-            $database = StandalonePostgresql::whereName('coolify-db')->first();
+            $this->database = StandalonePostgresql::whereName('coolify-db')->first();
             $s3s = S3Storage::whereTeamId(0)->get() ?? [];
-            if ($database) {
-                if ($database->status !== 'running') {
-                    $database->status = 'running';
-                    $database->save();
+            if ($this->database) {
+                if ($this->database->status !== 'running') {
+                    $this->database->status = 'running';
+                    $this->database->save();
                 }
-                $this->database = $database;
+                $this->backup = $this->database->scheduledBackups->first();
+                $this->executions = $this->backup->executions;
             }
             $this->settings = $settings;
             $this->s3s = $s3s;
 
-            $scheduledBackups = data_get($this->database, 'scheduledBackups');
-            if ($scheduledBackups) {
-                $this->backup = $scheduledBackups->first();
-            }
-            $executions = data_get($this->backup, 'executions');
-            if ($executions) {
-                $this->executions = $executions;
-            }
         } else {
             return redirect()->route('dashboard');
         }
diff --git a/resources/views/livewire/settings-backup.blade.php b/resources/views/livewire/settings-backup.blade.php
index bf29481cc..9eb34e8b7 100644
--- a/resources/views/livewire/settings-backup.blade.php
+++ b/resources/views/livewire/settings-backup.blade.php
@@ -14,7 +14,7 @@
         </div>
         <div class="pb-4">Backup configuration for Coolify instance.</div>
         <div>
-            @if (isset($database))
+            @if (isset($database) && isset($backup))
                 <div class="flex flex-col gap-3 pb-4">
                     <div class="flex gap-2">
                         <x-forms.input label="UUID" readonly id="database.uuid" />
@@ -27,14 +27,15 @@
                     </div>
                 </div>
                 <livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
+                <div class="py-4">
+                    <livewire:project.database.backup-executions :backup="$backup" />
+                </div>
             @else
                 To configure automatic backup for your Coolify instance, you first need to add a database resource
                 into Coolify.
                 <x-forms.button class="mt-2" wire:click="add_coolify_database">Add Database</x-forms.button>
             @endif
         </div>
-        <div class="py-4">
-            <livewire:project.database.backup-executions :backup="$backup" />
-        </div>
+
     </div>
 </div>