diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php
index 101bb4593..18ec9cd96 100644
--- a/app/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Livewire/Project/Database/BackupExecutions.php
@@ -2,11 +2,12 @@
 
 namespace App\Livewire\Project\Database;
 
+use App\Models\ScheduledDatabaseBackup;
 use Livewire\Component;
 
 class BackupExecutions extends Component
 {
-    public $backup;
+    public ?ScheduledDatabaseBackup $backup = null;
     public $executions = [];
     public $setDeletableBackup;
     public function getListeners()
@@ -20,8 +21,11 @@ public function getListeners()
 
     public function cleanupFailed()
     {
-        $this->backup?->executions()->where('status', 'failed')->delete();
-        $this->refreshBackupExecutions();
+        if ($this->backup) {
+            $this->backup?->executions()->where('status', 'failed')->delete();
+            $this->refreshBackupExecutions();
+            $this->dispatch('success', 'Failed backups cleaned up.');
+        }
     }
     public function deleteBackup($exeuctionId)
     {
@@ -45,6 +49,6 @@ public function download_file($exeuctionId)
     }
     public function refreshBackupExecutions(): void
     {
-        $this->executions = $this->backup->executions()->get()->sortByDesc('created_at');
+        $this->executions = $this->backup?->executions()->get()->sortByDesc('created_at');
     }
 }
diff --git a/app/Livewire/Settings/Backup.php b/app/Livewire/Settings/Backup.php
index 121b73af8..82b3075c0 100644
--- a/app/Livewire/Settings/Backup.php
+++ b/app/Livewire/Settings/Backup.php
@@ -36,7 +36,7 @@ class Backup extends Component
 
     public function mount()
     {
-        $this->backup = $this->database?->scheduledBackups->first() ?? [];
+        $this->backup = $this->database?->scheduledBackups->first() ?? null;
         $this->executions = $this->backup?->executions ?? [];
     }
     public function add_coolify_database()
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index 34e2b965d..dd96e13a9 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -1,54 +1,57 @@
 <div>
-    <div class="flex items-center gap-2">
-        <h3 class="py-4">Executions</h3>
-        <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
-    </div>
-    <div class="flex flex-col-reverse gap-2">
-        @forelse($executions as $execution)
-            <form wire:key="{{ data_get($execution, 'id') }}"
-                class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100"
-                @class([
-                    'border-green-500' => data_get($execution, 'status') === 'success',
-                    'border-red-500' => data_get($execution, 'status') === 'failed',
-                ])>
-                @if (data_get($execution, 'status') === 'running')
-                    <div class="absolute top-2 right-2">
-                        <x-loading />
-                    </div>
-                @endif
-                <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
-                <div>Status: {{ data_get($execution, 'status') }}</div>
-                <div>Started At: {{ data_get($execution, 'created_at') }}</div>
-                @if (data_get($execution, 'message'))
-                    <div>Message: {{ data_get($execution, 'message') }}</div>
-                @endif
-                <div>Size: {{ data_get($execution, 'size') }} B /
-                    {{ round((int) data_get($execution, 'size') / 1024, 2) }}
-                    kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
-                </div>
-                <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
-                <div class="flex gap-2">
-                    <div class="flex-1"></div>
-                    @if (data_get($execution, 'status') === 'success')
-                        <x-forms.button class=" dark:hover:bg-coolgray-400"
-                            x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+    @isset($backup)
+        <div class="flex items-center gap-2">
+            <h3 class="py-4">Executions</h3>
+            <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
+        </div>
+        <div class="flex flex-col-reverse gap-2">
+            @forelse($executions as $execution)
+                <form wire:key="{{ data_get($execution, 'id') }}"
+                    class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100"
+                    @class([
+                        'border-green-500' => data_get($execution, 'status') === 'success',
+                        'border-red-500' => data_get($execution, 'status') === 'failed',
+                    ])>
+                    @if (data_get($execution, 'status') === 'running')
+                        <div class="absolute top-2 right-2">
+                            <x-loading />
+                        </div>
                     @endif
-                    <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
-                        <x-slot:button-title>
-                            Delete
-                        </x-slot:button-title>
-                        This will delete this backup. It is not reversible.<br>Please think again.
-                    </x-modal-confirmation>
-                </div>
-            </form>
+                    <div>Database: {{ data_get($execution, 'database_name', 'N/A') }}</div>
+                    <div>Status: {{ data_get($execution, 'status') }}</div>
+                    <div>Started At: {{ data_get($execution, 'created_at') }}</div>
+                    @if (data_get($execution, 'message'))
+                        <div>Message: {{ data_get($execution, 'message') }}</div>
+                    @endif
+                    <div>Size: {{ data_get($execution, 'size') }} B /
+                        {{ round((int) data_get($execution, 'size') / 1024, 2) }}
+                        kB / {{ round((int) data_get($execution, 'size') / 1024 / 1024, 3) }} MB
+                    </div>
+                    <div>Location: {{ data_get($execution, 'filename', 'N/A') }}</div>
+                    <div class="flex gap-2">
+                        <div class="flex-1"></div>
+                        @if (data_get($execution, 'status') === 'success')
+                            <x-forms.button class=" dark:hover:bg-coolgray-400"
+                                x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
+                        @endif
+                        <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">
+                            <x-slot:button-title>
+                                Delete
+                            </x-slot:button-title>
+                            This will delete this backup. It is not reversible.<br>Please think again.
+                        </x-modal-confirmation>
+                    </div>
+                </form>
+
+            @empty
+                <div>No executions found.</div>
+            @endforelse
+        </div>
+        <script>
+            function download_file(executionId) {
+                window.open('/download/backup/' + executionId, '_blank');
+            }
+        </script>
+    @endisset
 
-        @empty
-            <div>No executions found.</div>
-        @endforelse
-    </div>
-    <script>
-        function download_file(executionId) {
-            window.open('/download/backup/' + executionId, '_blank');
-        }
-    </script>
 </div>
diff --git a/resources/views/livewire/settings/backup.blade.php b/resources/views/livewire/settings/backup.blade.php
index 7dc1dadd3..cd1d1f428 100644
--- a/resources/views/livewire/settings/backup.blade.php
+++ b/resources/views/livewire/settings/backup.blade.php
@@ -30,7 +30,6 @@
             @endif
         </div>
         <div class="py-4">
-            <h2 class="pb-4">Executions</h2>
             <livewire:project.database.backup-executions :backup="$backup" :executions="$executions" />
         </div>
     </div>