diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 4feba9a8405..b05dbbaf511 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -37,9 +37,6 @@ importers:
       '@hcengineering/account-client':
         specifier: ^0.7.3
         version: 0.7.3
-      '@hcengineering/analytics':
-        specifier: ^0.7.3
-        version: 0.7.3
       '@hcengineering/analytics-service':
         specifier: ^0.7.3
         version: 0.7.3(encoding@0.1.13)
@@ -31332,6 +31329,7 @@ snapshots:
   '@rush-temp/telegram-resources@file:projects/telegram-resources.tgz(@babel/core@7.23.9)(@jest/types@29.6.3)(@types/node@22.15.29)(babel-jest@29.7.0(@babel/core@7.23.9))(esbuild@0.25.9)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.9.3)))(postcss@8.5.3)(prosemirror-inputrules@1.4.0)(prosemirror-model@1.24.1)(prosemirror-state@1.4.3)(prosemirror-view@1.37.2)(ts-node@10.9.2(@swc/core@1.13.5)(@types/node@22.15.29)(typescript@5.9.3))':
     dependencies:
       '@hcengineering/account-client': 0.7.3
+      '@hcengineering/analytics': 0.7.3
       '@hcengineering/core': 0.7.3
       '@hcengineering/platform': 0.7.3
       '@hcengineering/platform-rig': 0.7.15
diff --git a/packages/integration-client/src/client.ts b/packages/integration-client/src/client.ts
index 4645c5039f6..8241e22c699 100644
--- a/packages/integration-client/src/client.ts
+++ b/packages/integration-client/src/client.ts
@@ -337,4 +337,38 @@ export class IntegrationClientImpl implements IntegrationClient {
       await this.client.addIntegrationSecret(data)
     }
   }
+
+  async setIntegrationEnabled (integrationKey: IntegrationKey, enabled: boolean): Promise<void> {
+    try {
+      const integration = await this.client.getIntegration(integrationKey)
+      if (integration == null) {
+        throw new Error(`Integration not found: ${JSON.stringify(integrationKey)}`)
+      }
+
+      const data = {
+        ...integration.data,
+        disabled: !enabled
+      }
+
+      await this.client.updateIntegration({
+        ...integration,
+        data
+      })
+
+      const eventData: IntegrationEventData = {
+        integration: { ...integration, data },
+        timestamp: Date.now()
+      }
+      this.emit('integration:updated', eventData)
+    } catch (error) {
+      const errorData: IntegrationErrorData = {
+        operation: 'setIntegrationEnabled',
+        error: error instanceof Error ? error.message : String(error),
+        integrationKey,
+        timestamp: Date.now()
+      }
+      this.emit('integration:error', errorData)
+      throw error
+    }
+  }
 }
diff --git a/packages/integration-client/src/types.ts b/packages/integration-client/src/types.ts
index aaf1c3761fd..3afbc3e5a93 100644
--- a/packages/integration-client/src/types.ts
+++ b/packages/integration-client/src/types.ts
@@ -72,6 +72,11 @@ export interface IntegrationClient {
    * Set or update integration secret
    */
   setSecret: (data: IntegrationSecret) => Promise<void>
+
+  /**
+   * Disable or enable an integration
+   */
+  setIntegrationEnabled: (integrationKey: IntegrationKey, enabled: boolean) => Promise<void>
 }
 
 export interface IntegrationEventData {
diff --git a/packages/integration-client/src/utils.ts b/packages/integration-client/src/utils.ts
index 62f93d9c932..a08d2b13b9a 100644
--- a/packages/integration-client/src/utils.ts
+++ b/packages/integration-client/src/utils.ts
@@ -14,6 +14,7 @@
 //
 
 import { Integration } from '@hcengineering/account-client'
+import platform, { PlatformError } from '@hcengineering/platform'
 import { IntegrationEventData } from './types'
 
 export function isWorkspaceIntegration (integration: Integration): boolean {
@@ -34,3 +35,17 @@ export function isSameIntegrationEvent (event: IntegrationEventData, integration
 export function getIntegrationConfig (integration: Integration): Record<string, any> | undefined {
   return integration?.data?.config
 }
+
+export function isDisabled (integration: Integration): boolean {
+  return integration?.data?.disabled === true
+}
+
+export function isUnauthorizedError (error: any): boolean {
+  if (error instanceof PlatformError && error.status.code === platform.status.Unauthorized) {
+    return true
+  }
+  if (error?.status === 401 || error?.status?.code === 401) {
+    return true
+  }
+  return false
+}
diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss
index b44a16306da..de226a53a8a 100644
--- a/packages/theme/styles/_colors.scss
+++ b/packages/theme/styles/_colors.scss
@@ -403,6 +403,10 @@
   --theme-label-blue-bg-color: rgba(59, 130, 246, .08);
   --theme-label-blue-border-color: rgba(59, 130, 246, .2);
 
+  --theme-label-orange-color: rgba(249, 115, 22, .8);
+  --theme-label-orange-bg-color: rgba(249, 115, 22, .08);
+  --theme-label-orange-border-color: rgba(249, 115, 22, .2);
+
   --theme-label-gray-color: rgba(255, 255, 255, .6);
   --theme-label-gray-bg-color: rgba(255, 255, 255, .02);
   --theme-label-gray-border-color: rgba(255, 255, 255, .09);
@@ -718,6 +722,10 @@
   --theme-label-blue-bg-color: rgba(59, 130, 246, .08);
   --theme-label-blue-border-color: rgba(59, 130, 246, .15);
 
+  --theme-label-orange-color: rgba(194, 65, 12, 0.9);
+  --theme-label-orange-bg-color: rgba(249, 115, 22, .08);
+  --theme-label-orange-border-color: rgba(249, 115, 22, .15);
+
   --theme-label-gray-color: rgba(0, 0, 0, .6);
   --theme-label-gray-bg-color: rgba(0, 0, 0, .02);
   --theme-label-gray-border-color: rgba(0, 0, 0, .09);
diff --git a/plugins/setting-assets/lang/cs.json b/plugins/setting-assets/lang/cs.json
index 006026a9a81..43f8618c7dc 100644
--- a/plugins/setting-assets/lang/cs.json
+++ b/plugins/setting-assets/lang/cs.json
@@ -191,6 +191,7 @@
     "ServiceIsUnavailable": "Služba není k dispozici",
     "Integrated": "Integrované",
     "Connected": "Připojené",
+    "Disconnected": "Odpojené",
     "Available": "Dostupné",
     "NotConnectedIntegration": "Účet {account} není integrován s pracovním prostorem",
     "IntegrationIsUnstable": "Integrační služba má problémy. Některé funkce nemusí fungovat správně.",
diff --git a/plugins/setting-assets/lang/de.json b/plugins/setting-assets/lang/de.json
index 22712912b0e..2a41cbcb148 100644
--- a/plugins/setting-assets/lang/de.json
+++ b/plugins/setting-assets/lang/de.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "Dienst ist nicht verfügbar",
     "Integrated": "Integriert",
     "Connected": "Verbunden",
+    "Disconnected": "Getrennt",
     "Available": "Verfügbar",
     "NotConnectedIntegration": "Das Konto {account} ist nicht mit dem Arbeitsbereich integriert",
     "IntegrationIsUnstable": "Der Integrationsdienst hat Probleme. Einige Funktionen funktionieren möglicherweise nicht richtig.",
diff --git a/plugins/setting-assets/lang/en.json b/plugins/setting-assets/lang/en.json
index 42d5d81be98..2aab6077414 100644
--- a/plugins/setting-assets/lang/en.json
+++ b/plugins/setting-assets/lang/en.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "Service is unavailable",
     "Integrated": "Integrated",
     "Connected": "Connected",
+    "Disconnected": "Disconnected",
     "Available": "Available",
     "NotConnectedIntegration": "The account {account} is not integrated with the workspace",
     "IntegrationIsUnstable": "Integration service is experiencing issues. Some features may not work properly.",
diff --git a/plugins/setting-assets/lang/es.json b/plugins/setting-assets/lang/es.json
index 7dcf0014e63..e0e20d0a3f6 100644
--- a/plugins/setting-assets/lang/es.json
+++ b/plugins/setting-assets/lang/es.json
@@ -184,6 +184,7 @@
     "ServiceIsUnavailable": "El servicio no está disponible",
     "Integrated": "Integrado",
     "Connected": "Conectado",
+    "Disconnected": "Desconectado",
     "Available": "Disponible",
     "NotConnectedIntegration": "La cuenta {account} no está integrada con el espacio de trabajo",
     "IntegrationIsUnstable": "El servicio de integración está experimentando problemas. Es posible que algunas funciones no funcionen correctamente.",
diff --git a/plugins/setting-assets/lang/fr.json b/plugins/setting-assets/lang/fr.json
index 1ad81df5da4..4c6d4262d38 100644
--- a/plugins/setting-assets/lang/fr.json
+++ b/plugins/setting-assets/lang/fr.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "Le service n'est pas disponible",
     "Integrated": "Intégré",
     "Connected": "Connecté",
+    "Disconnected": "Déconnecté",
     "Available": "Disponible",
     "NotConnectedIntegration": "Le compte {account} n'est pas intégré au workspace",
     "IntegrationIsUnstable": "Le service d'intégration rencontre des problèmes. Certaines fonctionnalités peuvent ne pas fonctionner correctement.",
diff --git a/plugins/setting-assets/lang/it.json b/plugins/setting-assets/lang/it.json
index c8a6dd2048e..443521c7e10 100644
--- a/plugins/setting-assets/lang/it.json
+++ b/plugins/setting-assets/lang/it.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "Il servizio non è disponibile",
     "Integrated": "Integrato",
     "Connected": "Connesso",
+    "Disconnected": "Disconnesso",
     "Available": "Disponibile",
     "NotConnectedIntegration": "L'account {account} non è integrato con il workspace",
     "IntegrationIsUnstable": "L'integrazione è instabile. Alcune funzionalità potrebbero non funzionare correttamente.",
diff --git a/plugins/setting-assets/lang/ja.json b/plugins/setting-assets/lang/ja.json
index bd985a94d1d..3066a7f0641 100644
--- a/plugins/setting-assets/lang/ja.json
+++ b/plugins/setting-assets/lang/ja.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "サービスは利用できません",
     "Integrated": "統合済み",
     "Connected": "接続済み",
+    "Disconnected": "切断済み",
     "Available": "利用可能",
     "NotConnectedIntegration": "アカウント {account} はワークスペースに統合されていません",
     "IntegrationIsUnstable": "統合サービスに問題が発生しています。一部の機能が正しく動作しない可能性があります。",
diff --git a/plugins/setting-assets/lang/pt.json b/plugins/setting-assets/lang/pt.json
index ee572f5e4f2..8a035c42553 100644
--- a/plugins/setting-assets/lang/pt.json
+++ b/plugins/setting-assets/lang/pt.json
@@ -184,6 +184,7 @@
     "ServiceIsUnavailable": "Serviço indisponível",
     "Integrated": "Integrado",
     "Connected": "Conectado",
+    "Disconnected": "Desconectado",
     "Available": "Disponível",
     "NotConnectedIntegration": "A conta {account} não está integrada com o espaço de trabalho",
     "IntegrationIsUnstable": "O serviço de integração está enfrentando problemas. Algumas funcionalidades podem não funcionar corretamente."
diff --git a/plugins/setting-assets/lang/ru.json b/plugins/setting-assets/lang/ru.json
index 9be6eba8a7c..63c1a5d8607 100644
--- a/plugins/setting-assets/lang/ru.json
+++ b/plugins/setting-assets/lang/ru.json
@@ -196,6 +196,7 @@
     "ServiceIsUnavailable": "Сервис недоступен",
     "Integrated": "Интегрировано",
     "Connected": "Подключено",
+    "Disconnected": "Отключено",
     "Available": "Доступно",
     "NotConnectedIntegration": "Учетная запись {account} не интегрирована с рабочим пространством",
     "IntegrationIsUnstable": "Сервис интеграции испытывает проблемы. Некоторые функции могут работать некорректно."
diff --git a/plugins/setting-assets/lang/tr.json b/plugins/setting-assets/lang/tr.json
index 151eac57749..56b726bdb2c 100644
--- a/plugins/setting-assets/lang/tr.json
+++ b/plugins/setting-assets/lang/tr.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "Servis kullanılamıyor",
     "Integrated": "Entegre",
     "Connected": "Bağlandı",
+    "Disconnected": "Bağlantı Kesildi",
     "Available": "Kullanılabilir",
     "NotConnectedIntegration": "{account} hesabı çalışma alanıyla entegre değil",
     "IntegrationIsUnstable": "Entegrasyon servisi sorunlar yaşıyor. Bazı özellikler düzgün çalışmayabilir.",
diff --git a/plugins/setting-assets/lang/zh.json b/plugins/setting-assets/lang/zh.json
index e38267b81c9..a1af841d2f8 100644
--- a/plugins/setting-assets/lang/zh.json
+++ b/plugins/setting-assets/lang/zh.json
@@ -193,6 +193,7 @@
     "ServiceIsUnavailable": "服务不可用",
     "Integrated": "已集成",
     "Connected": "已连接",
+    "Disconnected": "已断开",
     "Available": "可用",
     "NotConnectedIntegration": "帐户 {account} 未与工作区集成",
     "IntegrationIsUnstable": "集成服务出现问题。某些功能可能无法正常工作。",
diff --git a/plugins/setting-resources/src/components/integrations/IntegrationCard.svelte b/plugins/setting-resources/src/components/integrations/IntegrationCard.svelte
index d4e5c627573..4a2269c6037 100644
--- a/plugins/setting-resources/src/components/integrations/IntegrationCard.svelte
+++ b/plugins/setting-resources/src/components/integrations/IntegrationCard.svelte
@@ -13,10 +13,9 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import { onMount, onDestroy } from 'svelte'
   import { fade } from 'svelte/transition'
-  import { getCurrentAccount } from '@hcengineering/core'
   import { getResource, translate } from '@hcengineering/platform'
-  import { getClient } from '@hcengineering/presentation'
   import type { IntegrationType } from '@hcengineering/setting'
   import {
     AnyComponent,
@@ -32,16 +31,49 @@
   } from '@hcengineering/ui'
   import { Analytics } from '@hcengineering/analytics'
   import { type Integration } from '@hcengineering/account-client'
+  import {
+    IntegrationClient,
+    isDisabled,
+    onIntegrationEvent,
+    IntegrationUpdatedData
+  } from '@hcengineering/integration-client'
   import IntegrationErrorNotification from './IntegrationErrorNotification.svelte'
+  import { getIntegrationClient } from '../../utils'
 
   import IntegrationLabel from './IntegrationLabel.svelte'
   import setting from '../../plugin'
 
   export let integrationType: IntegrationType
   export let integration: Integration | undefined
-  const client = getClient()
+  let integrationClient: IntegrationClient | undefined
 
   let isDisconnecting = false
+  const unsubscribers: (() => void)[] = []
+
+  onMount(async () => {
+    integrationClient = await getIntegrationClient(integrationType.kind)
+    subscribe()
+  })
+
+  onDestroy(() => {
+    unsubscribers.forEach((unsubscribe) => {
+      unsubscribe()
+    })
+  })
+
+  function subscribe (): void {
+    unsubscribers.push(onIntegrationEvent<IntegrationUpdatedData>('integration:updated', onUpdateIntegration))
+  }
+
+  function onUpdateIntegration (data: IntegrationUpdatedData): void {
+    if (
+      integration !== undefined &&
+      data.integration?.socialId === integration.socialId &&
+      data.integration?.workspaceUuid === integration.workspaceUuid
+    ) {
+      integration = { ...integration, ...data.integration }
+    }
+  }
 
   async function close (res: any): Promise<void> {
     /* TODO: if (res?.value && integration !== undefined) {
@@ -53,17 +85,8 @@
   }
 
   async function reconnect (res: any): Promise<void> {
-    if (res?.value) {
-      const current = await client.findOne(setting.class.Integration, {
-        createdBy: { $in: getCurrentAccount().socialIds },
-        type: integrationType._id
-      })
-      if (current === undefined) return
-      Analytics.handleEvent(`Reconnect integration: ${await translate(integrationType.label, {}, 'en')}`)
-      await client.update(current, {
-        disabled: false,
-        value: res.value
-      })
+    if (res?.connected === true && integration !== undefined) {
+      await integrationClient?.setIntegrationEnabled(integration, true)
     }
   }
 
@@ -126,8 +149,8 @@
     Analytics.handleEvent(`Configure/create integration: ${await translate(integrationType.label, {}, 'en')}`)
     showPopup(component, { integration }, 'top', close)
   }
-  const handleReconnect = (e: any) => {
-    if (integrationType.reconnectComponent) {
+  const handleReconnect = (e: any): void => {
+    if (integrationType.reconnectComponent !== undefined) {
       showPopup(integrationType.reconnectComponent, { integration }, eventToHTMLElement(e), reconnect)
     }
   }
@@ -177,7 +200,15 @@
         on:click={(ev) => handleConfigure(integrationType.createComponent)}
       />
     {:else if integration !== undefined}
-      {#if integrationType.configureComponent !== undefined && integration.workspaceUuid != null}
+      {#if isDisabled(integration) && integrationType.reconnectComponent !== undefined}
+        <Button
+          label={setting.string.Reconnect}
+          minWidth={'5rem'}
+          kind={'primary'}
+          disabled={isDisconnecting}
+          on:click={handleReconnect}
+        />
+      {:else if integrationType.configureComponent !== undefined && integration.workspaceUuid != null}
         <Button
           label={setting.string.Configure}
           minWidth={'5rem'}
diff --git a/plugins/setting-resources/src/components/integrations/IntegrationLabel.svelte b/plugins/setting-resources/src/components/integrations/IntegrationLabel.svelte
index 782032269df..e5346613354 100644
--- a/plugins/setting-resources/src/components/integrations/IntegrationLabel.svelte
+++ b/plugins/setting-resources/src/components/integrations/IntegrationLabel.svelte
@@ -17,27 +17,50 @@
   import { IntlString } from '@hcengineering/platform'
   import setting from '@hcengineering/setting'
   import { Label } from '@hcengineering/ui'
+  import { isDisabled } from '@hcengineering/integration-client'
 
   export let integration: Integration | undefined
 
-  function getIntegrationLabel (): IntlString {
+  type IntegrationStatus = 'available' | 'disconnected' | 'connected' | 'integrated'
+
+  function getIntegrationStatus (integration: Integration | undefined): IntegrationStatus {
     if (integration === undefined) {
-      return setting.string.Available
+      return 'available'
+    }
+    if (isDisabled(integration)) {
+      return 'disconnected'
     }
     if (integration.workspaceUuid == null) {
-      return setting.string.Connected
+      return 'connected'
+    }
+    return 'integrated'
+  }
+
+  function getIntegrationLabel (status: IntegrationStatus): IntlString {
+    switch (status) {
+      case 'available':
+        return setting.string.Available
+      case 'disconnected':
+        return setting.string.Disconnected
+      case 'connected':
+        return setting.string.Connected
+      case 'integrated':
+        return setting.string.Integrated
     }
-    return setting.string.Integrated
   }
+
+  $: status = getIntegrationStatus(integration)
+  $: label = getIntegrationLabel(status)
 </script>
 
 <span
   class="integration-label"
-  class:new-connection={integration === undefined}
-  class:connected={integration !== undefined && integration.workspaceUuid == null}
-  class:integrated={integration?.workspaceUuid != null}
+  class:available={status === 'available'}
+  class:disconnected={status === 'disconnected'}
+  class:connected={status === 'connected'}
+  class:integrated={status === 'integrated'}
 >
-  <Label label={getIntegrationLabel()} />
+  <Label {label} />
 </span>
 
 <style>
@@ -52,12 +75,18 @@
     border: 1px solid;
   }
 
-  .new-connection {
+  .available {
     background-color: var(--theme-label-gray-bg-color);
     color: var(--theme-label-gray-color);
     border-color: var(--theme-label-gray-border-color);
   }
 
+  .disconnected {
+    background-color: var(--theme-label-orange-bg-color);
+    color: var(--theme-label-orange-color);
+    border-color: var(--theme-label-orange-border-color);
+  }
+
   .connected {
     background-color: var(--theme-label-blue-bg-color);
     color: var(--theme-label-blue-color);
diff --git a/plugins/setting-resources/src/utils.ts b/plugins/setting-resources/src/utils.ts
index 8157a3c5bb4..e62e11fb115 100644
--- a/plugins/setting-resources/src/utils.ts
+++ b/plugins/setting-resources/src/utils.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import contact, { getFirstName, getLastName } from '@hcengineering/contact'
 import { employeeByPersonIdStore } from '@hcengineering/contact-resources'
-import { type Class, type Doc, type Hierarchy, type Ref } from '@hcengineering/core'
+import { type IntegrationKind, type Class, type Doc, type Hierarchy, type Ref } from '@hcengineering/core'
 import { getMetadata } from '@hcengineering/platform'
 import login from '@hcengineering/login'
 import presentation, { getClient } from '@hcengineering/presentation'
@@ -9,6 +9,10 @@ import setting from '@hcengineering/setting'
 import { type TemplateDataProvider } from '@hcengineering/templates'
 import { getClient as getAccountClientRaw, type AccountClient } from '@hcengineering/account-client'
 import { get } from 'svelte/store'
+import {
+  getIntegrationClient as getIntegrationClientRaw,
+  type IntegrationClient
+} from '@hcengineering/integration-client'
 
 function isEditable (hierarchy: Hierarchy, p: Class<Doc>): boolean {
   let ancestors = [p._id]
@@ -100,3 +104,12 @@ export function getAccountClient (): AccountClient {
 
   return getAccountClientRaw(accountsUrl, token)
 }
+
+export async function getIntegrationClient (kind: IntegrationKind): Promise<IntegrationClient> {
+  const accountsUrl = getMetadata(login.metadata.AccountsUrl)
+  const token = getMetadata(presentation.metadata.Token)
+  if (accountsUrl === undefined || token === undefined) {
+    throw new Error('Accounts URL or token is not defined')
+  }
+  return getIntegrationClientRaw(accountsUrl, token, kind, 'settings')
+}
diff --git a/plugins/setting/src/index.ts b/plugins/setting/src/index.ts
index 87fa5f55c9f..d948a068b72 100644
--- a/plugins/setting/src/index.ts
+++ b/plugins/setting/src/index.ts
@@ -285,6 +285,7 @@ export default plugin(settingId, {
     ServiceIsUnavailable: '' as IntlString,
     Integrated: '' as IntlString,
     Connected: '' as IntlString,
+    Disconnected: '' as IntlString,
     Available: '' as IntlString,
     NotConnectedIntegration: '' as IntlString,
     IntegrationIsUnstable: '' as IntlString
diff --git a/plugins/telegram-resources/package.json b/plugins/telegram-resources/package.json
index c1522c1ca2f..bc6bae0ddb5 100644
--- a/plugins/telegram-resources/package.json
+++ b/plugins/telegram-resources/package.json
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@hcengineering/account-client": "^0.7.3",
+    "@hcengineering/analytics": "^0.7.3",
     "@hcengineering/attachment": "^0.7.0",
     "@hcengineering/attachment-resources": "^0.7.0",
     "@hcengineering/card": "^0.7.0",
diff --git a/plugins/telegram-resources/src/api.ts b/plugins/telegram-resources/src/api.ts
index 15b410f4b0c..bf1b3bbf565 100644
--- a/plugins/telegram-resources/src/api.ts
+++ b/plugins/telegram-resources/src/api.ts
@@ -55,7 +55,7 @@ const baseUrl = concatLink(url, 'api/integrations')
 
 async function request (method: 'GET' | 'POST' | 'DELETE', path?: string, body?: any): Promise<any> {
   const token = getMetadata(presentation.metadata.Token)
-  return await withRetry(async () => await httpRequest({ baseUrl, method, path, token, body }))
+  return await withRetry(async () => await httpRequest({ baseUrl, method, path, token, body }), { maxRetries: 3 })
 }
 
 export async function getState (phone: string): Promise<IntegrationState> {
diff --git a/plugins/telegram-resources/src/components/Connect.svelte b/plugins/telegram-resources/src/components/Connect.svelte
index a37adf0e94b..968fe191a8a 100644
--- a/plugins/telegram-resources/src/components/Connect.svelte
+++ b/plugins/telegram-resources/src/components/Connect.svelte
@@ -16,14 +16,17 @@
   import platform, { IntlString, PlatformError } from '@hcengineering/platform'
   import ui, { Button, EditBox, IconClose, Label, IconError } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
+  import { type Integration } from '@hcengineering/account-client'
   import { isValidPhoneNumber } from 'libphonenumber-js'
+  import { Analytics } from '@hcengineering/analytics'
 
   import PhoneInput from './PhoneInput.svelte'
   import PinPad from './PinPad.svelte'
   import telegram from '../plugin'
-  import { command, getState, type IntegrationState, connect } from '../api'
+  import { command, getState, type IntegrationState, connect, disconnect } from '../api'
 
-  export let integration: any
+  export let integration: Integration | undefined = undefined
+  export let reconnect: boolean = false
 
   let phone: string = ''
   let code: string = ''
@@ -33,8 +36,9 @@
 
   const dispatch = createEventDispatcher()
 
-  function close (): void {
-    dispatch('close')
+  function close (value?: string): void {
+    const connected = state.mode === 'Authorized' || state.mode === 'Configured'
+    dispatch('close', { value, connected })
   }
 
   // Wrapper for command API with loading state management
@@ -117,11 +121,17 @@
     } else {
       switch (integrationState.status) {
         case 'authorized': {
+          const number = integrationState.number
           state = {
             mode: 'Authorized',
-            hint: integrationState.number,
+            hint: number,
             buttons: {
-              primary: { label: ui.string.Ok, handler: close }
+              primary: {
+                label: ui.string.Ok,
+                handler: () => {
+                  close(number)
+                }
+              }
               // secondary: { label: telegram.string.Disconnect }
             }
           }
@@ -182,9 +192,20 @@
 
   async function init (): Promise<void> {
     try {
-      const phone = integration?.data?.phone
-      if (phone !== undefined && phone !== '') {
-        integrationState = await getState(phone)
+      const phoneNumber = integration?.data?.phone
+
+      if (phoneNumber !== undefined && phoneNumber !== '') {
+        phone = phoneNumber
+
+        // If reconnecting, start authentication flow from the beginning
+        if (reconnect) {
+          await disconnectSession(phoneNumber)
+          // Add small delay to ensure session is fully disconnected
+          await new Promise((resolve) => setTimeout(resolve, 100))
+          integrationState = await commandWithLoading(phoneNumber, 'start')
+        } else {
+          integrationState = await getState(phoneNumber)
+        }
       } else {
         integrationState = 'Missing'
       }
@@ -193,14 +214,27 @@
       state = {
         mode: 'Error',
         hint: ex.message,
-
+        errorLabel: getErrorLabel(ex),
         buttons: {
-          primary: { label: ui.string.Ok, handler: close }
+          primary: {
+            label: ui.string.Ok,
+            handler: () => {
+              close()
+            }
+          }
         }
       }
     }
   }
 
+  async function disconnectSession (phoneNumber: string): Promise<void> {
+    try {
+      await disconnect(phoneNumber)
+    } catch (error: any) {
+      Analytics.handleError(error)
+    }
+  }
+
   void init()
 </script>
 
@@ -208,7 +242,12 @@
   <div class="flex-between header">
     <div class="overflow-label fs-title"><Label label={telegram.string.ConnectFull} /></div>
     <!-- svelte-ignore a11y-click-events-have-key-events a11y-no-static-element-interactions -->
-    <div class="tool" on:click={close}>
+    <div
+      class="tool"
+      on:click={() => {
+        close()
+      }}
+    >
       <IconClose size={'small'} />
     </div>
   </div>
@@ -303,9 +342,6 @@
       flex-grow: 1;
       height: fit-content;
       margin: 0 1.75rem 0.5rem;
-      p {
-        margin: 0 0 1rem;
-      }
 
       .footer {
         display: flex;
diff --git a/plugins/telegram-resources/src/components/IntegrationState.svelte b/plugins/telegram-resources/src/components/IntegrationState.svelte
index b36e1a8154e..322cfff26f7 100644
--- a/plugins/telegram-resources/src/components/IntegrationState.svelte
+++ b/plugins/telegram-resources/src/components/IntegrationState.svelte
@@ -15,7 +15,13 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte'
   import type { Integration } from '@hcengineering/account-client'
-  import { IntegrationClient, IntegrationUpdatedData, onIntegrationEvent } from '@hcengineering/integration-client'
+  import {
+    IntegrationClient,
+    IntegrationUpdatedData,
+    onIntegrationEvent,
+    isDisabled,
+    isUnauthorizedError
+  } from '@hcengineering/integration-client'
   import { BaseIntegrationState, IntegrationStateRow } from '@hcengineering/setting-resources'
   import { OK, ERROR, Status } from '@hcengineering/platform'
 
@@ -32,6 +38,16 @@
   let integrationClient: IntegrationClient | undefined
   const unsubscribers: (() => void)[] = []
 
+  async function handleUnauthorized (): Promise<void> {
+    if (isDisabled(integration)) {
+      return
+    }
+    if (integrationClient === undefined) {
+      integrationClient = await getIntegrationClient()
+    }
+    await integrationClient.setIntegrationEnabled(integration, false)
+  }
+
   onMount(async () => {
     try {
       integrationClient = await getIntegrationClient()
@@ -49,10 +65,13 @@
       isLoading = false
       status = OK
       subscribe()
-    } catch (err) {
+    } catch (err: any) {
       status = ERROR
       isLoading = false
       console.error('Error loading channels:', err)
+      if (isUnauthorizedError(err)) {
+        await handleUnauthorized()
+      }
     }
   })
 
@@ -71,6 +90,7 @@
       data.integration?.socialId === integration.socialId &&
       data.integration?.workspaceUuid === integration.workspaceUuid
     ) {
+      integration = { ...integration, ...data.integration }
       const channelConfig: TelegramChannelData[] = data.newConfig?.channels
       if (channelConfig != null) {
         channels = channels.map((channel) => {
@@ -83,7 +103,8 @@
           }
           return channel
         })
-      } else {
+      }
+      if (channelConfig == null || status?.code === ERROR.code) {
         void refresh()
       }
     }
@@ -91,6 +112,9 @@
 
   async function refresh (): Promise<void> {
     try {
+      if (isDisabled(integration)) {
+        return
+      }
       if (integrationClient === undefined) {
         integrationClient = await getIntegrationClient()
       }
@@ -101,8 +125,13 @@
         ...channel,
         syncEnabled: channel.mode === 'sync'
       }))
+      status = OK
     } catch (err: any) {
       console.error('Error refresh channels:', err.message)
+      status = ERROR
+      if (isUnauthorizedError(err as Error)) {
+        await handleUnauthorized()
+      }
     }
   }
 
diff --git a/plugins/telegram-resources/src/components/Reconnect.svelte b/plugins/telegram-resources/src/components/Reconnect.svelte
index d410ef55923..543872aaec2 100644
--- a/plugins/telegram-resources/src/components/Reconnect.svelte
+++ b/plugins/telegram-resources/src/components/Reconnect.svelte
@@ -13,225 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { concatLink, getCurrentAccount } from '@hcengineering/core'
-  import { getMetadata } from '@hcengineering/platform'
-  import presentation, { getClient } from '@hcengineering/presentation'
-  import setting from '@hcengineering/setting'
-  import { Button, EditBox, IconClose, Label } from '@hcengineering/ui'
-  import { createEventDispatcher } from 'svelte'
-  import PhoneInput from './PhoneInput.svelte'
-  import telegram from '../plugin'
-  import PinPad from './PinPad.svelte'
+  import { Integration } from '@hcengineering/account-client'
+  import Connect from './Connect.svelte'
 
-  const dispatch = createEventDispatcher()
-
-  let requested = false
-  let secondFactor = false
-  let connecting = false
-  let phone: string = ''
-  let code: string = ''
-  let password: string = ''
-  let error: string | undefined = undefined
-  const url = getMetadata(telegram.metadata.TelegramURL) ?? ''
-
-  async function requestCode (): Promise<void> {
-    const res = await sendRequest('/signin', { phone })
-    if (res.next === 'code') {
-      requested = true
-    }
-
-    if (res.next === 'end') {
-      dispatch('close', { value: phone })
-    }
-  }
-
-  async function sendPassword (): Promise<void> {
-    const res = await sendRequest('/signin/pass', { phone, pass: password })
-    if (res.next === 'end') {
-      dispatch('close', { value: phone })
-    }
-  }
-
-  async function sendCode (): Promise<void> {
-    const res = await sendRequest('/signin/code', { phone, code })
-    if (res.next === 'pass') {
-      secondFactor = true
-    } else if (res.next === 'end') {
-      dispatch('close', { value: phone })
-    }
-  }
-
-  async function sendRequest (path: string, data: any): Promise<any> {
-    connecting = true
-    const response = await fetch(concatLink(url, path), {
-      method: 'POST',
-      headers: {
-        Authorization: 'Bearer ' + getMetadata(presentation.metadata.Token),
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify(data)
-    })
-    const res = await response.json()
-    connecting = false
-
-    if (Math.trunc(response.status / 100) !== 2) {
-      if (res.code === 'PHONE_CODE_INVALID') {
-        error = 'Invalid code'
-      }
-
-      throw new Error(res.message)
-    }
-
-    return res
-  }
-
-  function back () {
-    password = ''
-    code = ''
-    phone = ''
-    requested = false
-    secondFactor = false
-  }
-
-  $: label = connecting
-    ? telegram.string.Connecting
-    : requested || secondFactor
-      ? telegram.string.Connect
-      : telegram.string.Next
-
-  $: disabled = checkDisabled(connecting, secondFactor, password, requested, error, code, phone)
-
-  function checkDisabled (
-    connecting: boolean,
-    secondFactor: boolean,
-    password: string,
-    requested: boolean,
-    error: string | undefined,
-    code: string,
-    phone: string
-  ): boolean {
-    if (connecting) return true
-    if (secondFactor) return password.length === 0
-    if (requested) {
-      if (error !== undefined) return true
-      return !code.match(/^\d{5}$/)
-    }
-    return !phone.match(/^\+\d{9,15}$/)
-  }
-
-  function click () {
-    if (secondFactor) return sendPassword()
-    if (requested) return sendCode()
-    return requestCode()
-  }
-
-  const client = getClient()
-
-  async function getCurrent () {
-    const cuurent = await client.findOne(setting.class.Integration, {
-      type: telegram.integrationType.Telegram,
-      createdBy: { $in: getCurrentAccount().socialIds }
-    })
-    if (cuurent !== undefined) {
-      phone = cuurent.value
-    }
-  }
+  export let integration: Integration | undefined = undefined
 </script>
 
-<div class="card">
-  <div class="flex-between header">
-    <div class="overflow-label fs-title"><Label label={telegram.string.ConnectFull} /></div>
-    <!-- svelte-ignore a11y-click-events-have-key-events -->
-    <div
-      class="tool"
-      on:click={() => {
-        dispatch('close')
-      }}
-    >
-      <IconClose size={'small'} />
-    </div>
-  </div>
-  <div class="content">
-    {#if secondFactor}
-      <p><Label label={telegram.string.PasswordDescr} /></p>
-      <EditBox
-        label={telegram.string.Password}
-        format="password"
-        placeholder={telegram.string.Password}
-        bind:value={password}
-      />
-    {:else if requested}
-      <p><Label label={telegram.string.CodeDescr} /></p>
-      <PinPad length={5} bind:value={code} bind:error />
-    {:else}
-      <p><Label label={telegram.string.PhoneDescr} /></p>
-      {#await getCurrent() then value}
-        <PhoneInput label={telegram.string.Phone} placeholder={telegram.string.PhonePlaceholder} bind:value={phone} />
-      {/await}
-    {/if}
-    <div class="footer">
-      <Button {label} kind={'primary'} {disabled} on:click={click} />
-      {#if requested || secondFactor}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <div class="link over-underline" on:click={back}><Label label={telegram.string.Back} /></div>
-      {/if}
-    </div>
-  </div>
-</div>
-
-<style lang="scss">
-  .card {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    width: 20rem;
-    min-width: 20rem;
-    max-width: 20rem;
-    background-color: var(--popup-bg-color);
-    border-radius: 0.75rem;
-    box-shadow: var(--popup-shadow);
-
-    .header {
-      flex-shrink: 0;
-      margin: 1.75rem 1.75rem 1.25rem;
-
-      .tool {
-        cursor: pointer;
-        &:hover {
-          color: var(--caption-color);
-        }
-        &:active {
-          color: var(--accent-color);
-        }
-      }
-    }
-
-    .content {
-      flex-shrink: 0;
-      flex-grow: 1;
-      height: fit-content;
-      margin: 0 1.75rem 0.5rem;
-      p {
-        margin: 0 0 1rem;
-      }
-
-      .footer {
-        display: flex;
-        flex-direction: row-reverse;
-        justify-content: space-between;
-        align-items: center;
-        padding: 1rem 0rem;
-
-        .link {
-          color: var(--accent-color);
-          &:hover {
-            color: var(--caption-color);
-          }
-          &:active {
-            color: var(--accent-color);
-          }
-        }
-      }
-    }
-  }
-</style>
+<Connect {integration} reconnect={true} on:close />