diff --git a/app/Livewire/Notifications/Telegram.php b/app/Livewire/Notifications/Telegram.php
index 862b9b3ea..b8063f5a8 100644
--- a/app/Livewire/Notifications/Telegram.php
+++ b/app/Livewire/Notifications/Telegram.php
@@ -4,54 +4,125 @@ namespace App\Livewire\Notifications;
 
 use App\Models\Team;
 use App\Notifications\Test;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class Telegram extends Component
 {
     public Team $team;
 
-    protected $rules = [
-        'team.telegram_enabled' => 'nullable|boolean',
-        'team.telegram_token' => 'required|string',
-        'team.telegram_chat_id' => 'required|string',
-        'team.telegram_notifications_test' => 'nullable|boolean',
-        'team.telegram_notifications_deployments' => 'nullable|boolean',
-        'team.telegram_notifications_status_changes' => 'nullable|boolean',
-        'team.telegram_notifications_database_backups' => 'nullable|boolean',
-        'team.telegram_notifications_scheduled_tasks' => 'nullable|boolean',
-        'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
-        'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
-        'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
-        'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
-        'team.telegram_notifications_scheduled_tasks_thread_id' => 'nullable|string',
-        'team.telegram_notifications_server_disk_usage' => 'nullable|boolean',
-    ];
+    #[Rule(['boolean'])]
+    public bool $telegramEnabled = false;
 
-    protected $validationAttributes = [
-        'team.telegram_token' => 'Token',
-        'team.telegram_chat_id' => 'Chat ID',
-    ];
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramToken = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramChatId = null;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsTest = false;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsDeployments = false;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsStatusChanges = false;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsDatabaseBackups = false;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsScheduledTasks = false;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramNotificationsTestMessageThreadId = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramNotificationsDeploymentsMessageThreadId = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramNotificationsStatusChangesMessageThreadId = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramNotificationsDatabaseBackupsMessageThreadId = null;
+
+    #[Rule(['nullable', 'string'])]
+    public ?string $telegramNotificationsScheduledTasksThreadId = null;
+
+    #[Rule(['boolean'])]
+    public bool $telegramNotificationsServerDiskUsage = false;
 
     public function mount()
     {
-        $this->team = auth()->user()->currentTeam();
+        try {
+            $this->team = auth()->user()->currentTeam();
+            $this->syncData();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function syncData(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->validate();
+            $this->team->telegram_enabled = $this->telegramEnabled;
+            $this->team->telegram_token = $this->telegramToken;
+            $this->team->telegram_chat_id = $this->telegramChatId;
+            $this->team->telegram_notifications_test = $this->telegramNotificationsTest;
+            $this->team->telegram_notifications_deployments = $this->telegramNotificationsDeployments;
+            $this->team->telegram_notifications_status_changes = $this->telegramNotificationsStatusChanges;
+            $this->team->telegram_notifications_database_backups = $this->telegramNotificationsDatabaseBackups;
+            $this->team->telegram_notifications_scheduled_tasks = $this->telegramNotificationsScheduledTasks;
+            $this->team->telegram_notifications_test_message_thread_id = $this->telegramNotificationsTestMessageThreadId;
+            $this->team->telegram_notifications_deployments_message_thread_id = $this->telegramNotificationsDeploymentsMessageThreadId;
+            $this->team->telegram_notifications_status_changes_message_thread_id = $this->telegramNotificationsStatusChangesMessageThreadId;
+            $this->team->telegram_notifications_database_backups_message_thread_id = $this->telegramNotificationsDatabaseBackupsMessageThreadId;
+            $this->team->telegram_notifications_scheduled_tasks_thread_id = $this->telegramNotificationsScheduledTasksThreadId;
+            $this->team->telegram_notifications_server_disk_usage = $this->telegramNotificationsServerDiskUsage;
+            try {
+                $this->saveModel();
+            } catch (\Throwable $e) {
+                return handleError($e, $this);
+            }
+        } else {
+            $this->telegramEnabled = $this->team->telegram_enabled;
+            $this->telegramToken = $this->team->telegram_token;
+            $this->telegramChatId = $this->team->telegram_chat_id;
+            $this->telegramNotificationsTest = $this->team->telegram_notifications_test;
+            $this->telegramNotificationsDeployments = $this->team->telegram_notifications_deployments;
+            $this->telegramNotificationsStatusChanges = $this->team->telegram_notifications_status_changes;
+            $this->telegramNotificationsDatabaseBackups = $this->team->telegram_notifications_database_backups;
+            $this->telegramNotificationsScheduledTasks = $this->team->telegram_notifications_scheduled_tasks;
+            $this->telegramNotificationsTestMessageThreadId = $this->team->telegram_notifications_test_message_thread_id;
+            $this->telegramNotificationsDeploymentsMessageThreadId = $this->team->telegram_notifications_deployments_message_thread_id;
+            $this->telegramNotificationsStatusChangesMessageThreadId = $this->team->telegram_notifications_status_changes_message_thread_id;
+            $this->telegramNotificationsDatabaseBackupsMessageThreadId = $this->team->telegram_notifications_database_backups_message_thread_id;
+            $this->telegramNotificationsScheduledTasksThreadId = $this->team->telegram_notifications_scheduled_tasks_thread_id;
+            $this->telegramNotificationsServerDiskUsage = $this->team->telegram_notifications_server_disk_usage;
+        }
+
     }
 
     public function instantSave()
     {
         try {
-            $this->submit();
-        } catch (\Throwable) {
-            $this->team->telegram_enabled = false;
-            $this->validate();
+            $this->syncData(true);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function submit()
     {
-        $this->resetErrorBag();
-        $this->validate();
-        $this->saveModel();
+        try {
+            $this->resetErrorBag();
+            $this->syncData(true);
+            $this->saveModel();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function saveModel()
@@ -63,8 +134,12 @@ class Telegram extends Component
 
     public function sendTestNotification()
     {
-        $this->team?->notify(new Test);
-        $this->dispatch('success', 'Test notification sent.');
+        try {
+            $this->team->notify(new Test);
+            $this->dispatch('success', 'Test notification sent.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function render()
diff --git a/resources/views/livewire/notifications/telegram.blade.php b/resources/views/livewire/notifications/telegram.blade.php
index 41fee8122..91fab7086 100644
--- a/resources/views/livewire/notifications/telegram.blade.php
+++ b/resources/views/livewire/notifications/telegram.blade.php
@@ -9,7 +9,7 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
-            @if ($team->telegram_enabled)
+            @if ($telegramEnabled)
                 <x-forms.button class="normal-case dark:text-white btn btn-xs no-animation btn-primary"
                     wire:click="sendTestNotification">
                     Send Test Notifications
@@ -17,64 +17,61 @@
             @endif
         </div>
         <div class="w-32">
-            <x-forms.checkbox instantSave id="team.telegram_enabled" label="Enabled" />
+            <x-forms.checkbox instantSave id="telegramEnabled" label="Enabled" />
         </div>
         <div class="flex gap-2">
 
-                <x-forms.input type="password" autocomplete="new-password"
-                    helper="Get it from the <a class='inline-block underline dark:text-white' href='https://t.me/botfather' target='_blank'>BotFather Bot</a> on Telegram."
-                required id="team.telegram_token" label="Token" />
+            <x-forms.input type="password" autocomplete="new-password"
+                helper="Get it from the <a class='inline-block underline dark:text-white' href='https://t.me/botfather' target='_blank'>BotFather Bot</a> on Telegram."
+                required id="telegramToken" label="Token" />
             <x-forms.input helper="Recommended to add your bot to a group chat and add its Chat ID here." required
-                    id="team.telegram_chat_id" label="Chat ID" />
+                id="telegramChatId" label="Chat ID" />
         </div>
-        @if (data_get($team, 'telegram_enabled'))
+        @if ($telegramEnabled)
             <h2 class="mt-4">Subscribe to events</h2>
             <div class="flex flex-col gap-4 w-96">
                 @if (isDev())
                     <div class="flex flex-col">
                         <h4>Test Notification</h4>
-                        <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_test"
-                            label="Enabled" />
+                        <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsTest" label="Enabled" />
                         <x-forms.input
                             helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                            id="team.telegram_notifications_test_message_thread_id" label="Custom Topic ID" />
+                            id="telegramNotificationsTestMessageThreadId" label="Custom Topic ID" />
                     </div>
                 @endif
                 <div class="flex flex-col">
                     <h4>Container Status Changes</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_status_changes"
-                        label="Enabled" />
+                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsStatusChanges" label="Enabled" />
                     <x-forms.input
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="team.telegram_notifications_status_changes_message_thread_id" label="Custom Topic ID" />
+                        id="telegramNotificationsStatusChangesMessageThreadId" label="Custom Topic ID" />
                 </div>
                 <div class="flex flex-col">
                     <h4>Application Deployments</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_deployments"
-                        label="Enabled" />
+                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsDeployments" label="Enabled" />
                     <x-forms.input
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="team.telegram_notifications_deployments_message_thread_id" label="Custom Topic ID" />
+                        id="telegramNotificationsDeploymentsMessageThreadId" label="Custom Topic ID" />
                 </div>
                 <div class="flex flex-col">
                     <h4>Database Backup Status</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_database_backups"
+                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsDatabaseBackups"
                         label="Enabled" />
                     <x-forms.input
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="team.telegram_notifications_database_backups_message_thread_id" label="Custom Topic ID" />
+                        id="telegramNotificationsDatabaseBackupsMessageThreadId" label="Custom Topic ID" />
                 </div>
                 <div class="flex flex-col">
                     <h4>Scheduled Tasks Status</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_scheduled_tasks"
-                    label="Enabled" />
+                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsScheduledTasks"
+                        label="Enabled" />
                     <x-forms.input
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
-                        id="team.telegram_notifications_scheduled_tasks_thread_id" label="Custom Topic ID" />
+                        id="telegramNotificationsScheduledTasksMessageThreadId" label="Custom Topic ID" />
                 </div>
                 <div class="flex flex-col">
                     <h4>Server Disk Usage</h4>
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_server_disk_usage"
+                    <x-forms.checkbox instantSave="saveModel" id="telegramNotificationsServerDiskUsage"
                         label="Enabled" />
                 </div>
             </div>