diff --git a/assets/js/dashboard/components/lazy-loader.js b/assets/js/dashboard/components/lazy-loader.js index 3824ef943..dd15c36eb 100644 --- a/assets/js/dashboard/components/lazy-loader.js +++ b/assets/js/dashboard/components/lazy-loader.js @@ -15,7 +15,7 @@ export default class extends React.Component { } componentWillUnmount() { - this.observer.unobserve(this.element); + this.observer && this.observer.unobserve(this.element); } render() { diff --git a/assets/js/dashboard/pinned-header-hoc.js b/assets/js/dashboard/pinned-header-hoc.js index 3150749db..d770213b7 100644 --- a/assets/js/dashboard/pinned-header-hoc.js +++ b/assets/js/dashboard/pinned-header-hoc.js @@ -24,7 +24,7 @@ export const withPinnedHeader = (WrappedComponent, selector) => { } componentWillUnmount() { - this.observer.unobserve(this.el); + this.observer && this.observer.unobserve(this.el); } render() {