diff --git a/source/WindowScroller/WindowScroller.js b/source/WindowScroller/WindowScroller.js
index 4c605b270..fe67a247c 100644
--- a/source/WindowScroller/WindowScroller.js
+++ b/source/WindowScroller/WindowScroller.js
@@ -158,6 +158,7 @@ export default class WindowScroller extends React.PureComponent<Props, State> {
   componentWillUnmount() {
     const scrollElement = this.props.scrollElement;
     if (scrollElement) {
+      unregisterScrollListener(this, scrollElement);
       this._unregisterResizeListener(scrollElement);
     }