diff --git a/app/client/api-client/types.gen.ts b/app/client/api-client/types.gen.ts
index 7fb6d77..7e82ed3 100644
--- a/app/client/api-client/types.gen.ts
+++ b/app/client/api-client/types.gen.ts
@@ -1965,6 +1965,10 @@ export type GetScheduleNotificationsResponses = {
                 type: 'pushover';
                 userKey: string;
                 devices?: string;
+            } | {
+                botToken: string;
+                chatId: string;
+                type: 'telegram';
             } | {
                 from: string;
                 password: string;
@@ -1990,10 +1994,6 @@ export type GetScheduleNotificationsResponses = {
             } | {
                 shoutrrrUrl: string;
                 type: 'custom';
-            } | {
-                type: 'telegram';
-                botToken: string;
-                chatId: string;
             } | {
                 type: 'discord';
                 webhookUrl: string;
@@ -2053,6 +2053,10 @@ export type UpdateScheduleNotificationsResponses = {
                 type: 'pushover';
                 userKey: string;
                 devices?: string;
+            } | {
+                botToken: string;
+                chatId: string;
+                type: 'telegram';
             } | {
                 from: string;
                 password: string;
@@ -2078,10 +2082,6 @@ export type UpdateScheduleNotificationsResponses = {
             } | {
                 shoutrrrUrl: string;
                 type: 'custom';
-            } | {
-                type: 'telegram';
-                botToken: string;
-                chatId: string;
             } | {
                 type: 'discord';
                 webhookUrl: string;
@@ -2130,6 +2130,10 @@ export type ListNotificationDestinationsResponses = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2155,10 +2159,6 @@ export type ListNotificationDestinationsResponses = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
@@ -2191,6 +2191,10 @@ export type CreateNotificationDestinationData = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2216,10 +2220,6 @@ export type CreateNotificationDestinationData = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
@@ -2251,6 +2251,10 @@ export type CreateNotificationDestinationResponses = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2276,10 +2280,6 @@ export type CreateNotificationDestinationResponses = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
@@ -2358,6 +2358,10 @@ export type GetNotificationDestinationResponses = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2383,10 +2387,6 @@ export type GetNotificationDestinationResponses = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
@@ -2419,6 +2419,10 @@ export type UpdateNotificationDestinationData = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2444,10 +2448,6 @@ export type UpdateNotificationDestinationData = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
@@ -2489,6 +2489,10 @@ export type UpdateNotificationDestinationResponses = {
             type: 'pushover';
             userKey: string;
             devices?: string;
+        } | {
+            botToken: string;
+            chatId: string;
+            type: 'telegram';
         } | {
             from: string;
             password: string;
@@ -2514,10 +2518,6 @@ export type UpdateNotificationDestinationResponses = {
         } | {
             shoutrrrUrl: string;
             type: 'custom';
-        } | {
-            type: 'telegram';
-            botToken: string;
-            chatId: string;
         } | {
             type: 'discord';
             webhookUrl: string;
diff --git a/app/client/modules/notifications/components/create-notification-form.tsx b/app/client/modules/notifications/components/create-notification-form.tsx
index 4c809df..350536d 100644
--- a/app/client/modules/notifications/components/create-notification-form.tsx
+++ b/app/client/modules/notifications/components/create-notification-form.tsx
@@ -645,9 +645,7 @@ export const CreateNotificationForm = ({ onSubmit, mode = "create", initialValue
 									<FormControl>
 										<Input {...field} placeholder="-1231234567890" />
 									</FormControl>
-									<FormDescription>
-										Telegram chat ID to send notifications to.
-									</FormDescription>
+									<FormDescription>Telegram chat ID to send notifications to.</FormDescription>
 									<FormMessage />
 								</FormItem>
 							)}
diff --git a/app/client/modules/notifications/routes/notification-details.tsx b/app/client/modules/notifications/routes/notification-details.tsx
index 3a4ced5..082f475 100644
--- a/app/client/modules/notifications/routes/notification-details.tsx
+++ b/app/client/modules/notifications/routes/notification-details.tsx
@@ -171,13 +171,7 @@ export default function NotificationDetailsPage({ loaderData }: Route.ComponentP
 							</AlertDescription>
 						</Alert>
 					)}
-					<CreateNotificationForm
-						mode="update"
-						formId={formId}
-						onSubmit={handleSubmit}
-						initialValues={data.config}
-						loading={updateDestination.isPending}
-					/>
+					<CreateNotificationForm mode="update" formId={formId} onSubmit={handleSubmit} initialValues={data.config} />
 					<div className="flex justify-end gap-2 pt-4 border-t">
 						<Button type="submit" form={formId} loading={updateDestination.isPending}>
 							Save Changes
diff --git a/app/server/modules/notifications/builders/telegram.ts b/app/server/modules/notifications/builders/telegram.ts
index 3af34ad..5c9321c 100644
--- a/app/server/modules/notifications/builders/telegram.ts
+++ b/app/server/modules/notifications/builders/telegram.ts
@@ -1,8 +1,5 @@
 import type { NotificationConfig } from "~/schemas/notifications";
 
 export function buildTelegramShoutrrrUrl(config: Extract<NotificationConfig, { type: "telegram" }>): string {
-    // Shoutrrr format: telegram://bottoken@telegram?channels=chatid1,chatid2
-    // config: { type: 'telegram', botToken: string, chatId: string }
-    // Do NOT encode botToken or chatId; Shoutrrr expects raw values (colon, dash, etc.)
-    return `telegram://${config.botToken}@telegram?channels=${config.chatId}`;
+	return `telegram://${config.botToken}@telegram?channels=${config.chatId}`;
 }