diff --git a/.env b/.env
index 0e0ddd39bf..aa15019c05 100644
--- a/.env
+++ b/.env
@@ -43,3 +43,4 @@ LOGIN_DT_LOGO=
 SIDEBAR_DT_LOGO=
 USE_V2=
 ENABLE_EXTERNAL_ARGO_CD=false
+LOG_TERMINAL_EVENTS_TO_SENTRY=false
diff --git a/src/components/ClusterNodes/ClusterTerminal.tsx b/src/components/ClusterNodes/ClusterTerminal.tsx
index 55a63c3cc4..8c9c8a9e00 100644
--- a/src/components/ClusterNodes/ClusterTerminal.tsx
+++ b/src/components/ClusterNodes/ClusterTerminal.tsx
@@ -344,7 +344,7 @@ export default function ClusterTerminal({
             `user/terminal/get?namespace=${selectedNamespace.value}&shellName=${
                 selectedTerminalType.value
             }&terminalAccessId=${terminalAccessIdRef.current}&containerName=${
-                resourceData.containers?.[0].containerName || ''
+                resourceData?.containers?.[0].containerName || ''
             }`,
             terminalAccessIdRef.current,
             window?._env_?.CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT || 7,
diff --git a/src/components/terminal/TerminalWrapper.tsx b/src/components/terminal/TerminalWrapper.tsx
index c2187d8949..b1c382fc2a 100644
--- a/src/components/terminal/TerminalWrapper.tsx
+++ b/src/components/terminal/TerminalWrapper.tsx
@@ -12,6 +12,8 @@ import { AppDetails } from '../app/types'
 import './terminal.scss'
 import { Scroller } from '../app/details/cicdHistory/History.components'
 import { SocketConnectionType } from '../app/details/appDetails/appDetails.type'
+import { logExceptionToSentry } from '@devtron-labs/devtron-fe-common-lib'
+
 
 interface TerminalViewProps {
     appDetails: AppDetails
@@ -270,6 +272,7 @@ export class TerminalView extends Component<TerminalViewProps, TerminalViewState
         }
 
         socket.onclose = function (evt) {
+            if (window._env_.LOG_TERMINAL_EVENTS_TO_SENTRY && evt.reason !== 'Normal closure') logExceptionToSentry(evt)
             setSocketConnection('DISCONNECTED')
         }
 
diff --git a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
index 90f816ad40..846d264587 100644
--- a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
+++ b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
@@ -11,6 +11,8 @@ import { TERMINAL_STATUS } from './constants'
 import './terminal.scss'
 import { TerminalViewType } from './terminal.type'
 import { restrictXtermAccessibilityWidth } from './terminal.utils'
+import { logExceptionToSentry } from '@devtron-labs/devtron-fe-common-lib'
+
 
 let clusterTimeOut
 
@@ -183,6 +185,7 @@ export default function TerminalView({
         }
 
         _socket.onclose = function (evt) {
+            if (window._env_.LOG_TERMINAL_EVENTS_TO_SENTRY && evt.reason !== 'Normal closure') logExceptionToSentry(evt)
             disableInput()
             _terminal.writeln('')
             _terminal.writeln('---------------------------------------------')
diff --git a/src/index.tsx b/src/index.tsx
index 9c9aa1fb86..c255a3a602 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -12,6 +12,7 @@ interface customEnv {
     SENTRY_PERFORMANCE_ENABLED?: boolean
     SENTRY_DSN?: string
     SENTRY_TRACES_SAMPLE_RATE?: number
+    LOG_TERMINAL_EVENTS_TO_SENTRY?: boolean
     HOTJAR_ENABLED?: boolean
     CLUSTER_NAME?: boolean
     APPLICATION_METRICS_ENABLED?: boolean
@@ -135,6 +136,7 @@ if (!window || !window._env_) {
         SENTRY_PERFORMANCE_ENABLED: false,
         SENTRY_DSN: '',
         SENTRY_TRACES_SAMPLE_RATE: 0.2,
+        LOG_TERMINAL_EVENTS_TO_SENTRY: false,
         HOTJAR_ENABLED: false,
         GA_ENABLED: false,
         GTM_ENABLED: false,