diff --git a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx index cf9a729cc..e96689aae 100644 --- a/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx +++ b/services/frontend-service/src/ui/components/ServiceLane/ServiceLane.tsx @@ -128,9 +128,10 @@ export const ServiceLane: React.FC<{ if (document.getElementsByClassName('mdc-drawer-app-content').length !== 0) { document.getElementsByClassName('mdc-drawer-app-content')[0].addEventListener('scroll', handleScroll); return () => { - document - .getElementsByClassName('mdc-drawer-app-content')[0] - .removeEventListener('scroll', handleScroll); + const elem = document.getElementsByClassName('mdc-drawer-app-content')[0]; + if (elem) { + elem.removeEventListener('scroll', handleScroll); + } }; } }, [appDetails, application, authHeader, searchParams]);