diff --git a/docs/index.js b/docs/index.js
index e929aef..cd56245 100644
--- a/docs/index.js
+++ b/docs/index.js
@@ -34861,6 +34861,7 @@ Cogs.define("react-list.js", function (COGS_REQUIRE, COGS_REQUIRE_ASYNC, module,
         window.removeEventListener('resize', this.updateFrameAndClearCache);
         this.scrollParent.removeEventListener('scroll', this.updateFrameAndClearCache, PASSIVE);
         this.scrollParent.removeEventListener('mousewheel', NOOP, PASSIVE);
+        this.scrollParent = null; // Important to ensure proper setup on second mount in StrictMode
       }
     }, {
       key: "getOffset",
diff --git a/react-list.es6 b/react-list.es6
index 0bcd4bd..d641144 100644
--- a/react-list.es6
+++ b/react-list.es6
@@ -183,6 +183,7 @@ module.exports = class ReactList extends Component {
       PASSIVE
     );
     this.scrollParent.removeEventListener('mousewheel', NOOP, PASSIVE);
+    this.scrollParent = null; // Important to ensure proper setup on second mount in StrictMode
   }
 
   getOffset(el) {
diff --git a/react-list.js b/react-list.js
index 98cef81..e8c53b8 100644
--- a/react-list.js
+++ b/react-list.js
@@ -247,6 +247,7 @@
         window.removeEventListener('resize', this.updateFrameAndClearCache);
         this.scrollParent.removeEventListener('scroll', this.updateFrameAndClearCache, PASSIVE);
         this.scrollParent.removeEventListener('mousewheel', NOOP, PASSIVE);
+        this.scrollParent = null; // Important to ensure proper setup on second mount in StrictMode
       }
     }, {
       key: "getOffset",