diff --git a/demoApp/src/DemoApp.js b/demoApp/src/DemoApp.js
index 11c01ec..080f144 100644
--- a/demoApp/src/DemoApp.js
+++ b/demoApp/src/DemoApp.js
@@ -1,5 +1,5 @@
-import React, { useState, useRef } from "react";
-import Carousel from "react-elastic-carousel";
+import React, { useState, useRef, useEffect } from "react";
+import Carousel from "../../src/react-elastic-carousel/components/Carousel";
 import styled from "styled-components";
 
 const Item = styled.div`
@@ -16,7 +16,6 @@ const Item = styled.div`
 const Layout = styled.div`
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items: center;
   height: 100vh;
 `;
@@ -47,8 +46,12 @@ const CheckBox = ({ label, onToggle, ...rest }) => {
   );
 };
 
+const serverItems = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+
 const DemoApp = () => {
-  const [items, setItems] = useState([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+  const [show, setShow] = useState(true);
+  const [enableAutoPlay, setEnableAutoPlay] = useState(false);
+  const [items, setItems] = useState([]);
   const [itemsToShow, setItemsToShow] = useState(3);
   const [showArrows, setShowArrows] = useState(true);
   const [pagination, setPagination] = useState(true);
@@ -68,9 +71,20 @@ const DemoApp = () => {
 
   const goTo = ({ target }) => carouselRef.current.goTo(Number(target.value));
 
+  useEffect(() => {
+    setTimeout(() => {
+      setItems(serverItems);
+    }, 2500);
+  }, []);
+
   return (
     <Layout>
       <ControlsLayout>
+        <StyledControlFields>
+          <button onClick={() => setShow((o) => !o)}>
+            {`${show ? "Hide" : "Show"} Carousel`}
+          </button>
+        </StyledControlFields>
         <StyledControlFields>
           <button onClick={addItem}>Add Item</button>
           <button onClick={removeItem}>Remove Item</button>
@@ -102,18 +116,26 @@ const DemoApp = () => {
           checked={verticalMode}
           onToggle={setVerticalMode}
         />
+        <CheckBox
+          label="Auto Play"
+          checked={enableAutoPlay}
+          onToggle={setEnableAutoPlay}
+        />
       </ControlsLayout>
-      <Carousel
-        ref={carouselRef}
-        verticalMode={verticalMode}
-        itemsToShow={itemsToShow}
-        showArrows={showArrows}
-        pagination={pagination}
-      >
-        {items.map((item) => (
-          <Item key={item}>{item}</Item>
-        ))}
-      </Carousel>
+      {show && (
+        <Carousel
+          enableAutoPlay={enableAutoPlay}
+          ref={carouselRef}
+          verticalMode={verticalMode}
+          itemsToShow={itemsToShow}
+          showArrows={showArrows}
+          pagination={pagination}
+        >
+          {items.map((item) => (
+            <Item key={item}>{item}</Item>
+          ))}
+        </Carousel>
+      )}
     </Layout>
   );
 };
diff --git a/demoApp/src/index.js b/demoApp/src/index.js
index 5953049..dd3d709 100644
--- a/demoApp/src/index.js
+++ b/demoApp/src/index.js
@@ -1,5 +1,10 @@
 import React from "react";
 import ReactDOM from "react-dom";
-import DemoApp from './DemoApp';
+import DemoApp from "./DemoApp";
 
-ReactDOM.render(<DemoApp />, document.getElementById("app"));
+ReactDOM.render(
+  <React.StrictMode>
+    <DemoApp />
+  </React.StrictMode>,
+  document.getElementById("app")
+);
diff --git a/package.json b/package.json
index 49b62f0..4b21808 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-elastic-carousel",
-  "version": "0.11.4",
+  "version": "0.11.5-beta.3",
   "description": "A flexible and responsive carousel component for react",
   "author": "sag1v (Sagiv Ben Giat)",
   "license": "MIT",
@@ -25,7 +25,6 @@
     "test:watch": "react-scripts test --env=jsdom",
     "prebuild": "yarn run lint:fix",
     "build": "rollup -c",
-    "prepare": "yarn run build",
     "build-doc": "docz build",
     "deploy-doc": "gh-pages -d demo"
   },
diff --git a/src/react-elastic-carousel/components/Carousel.js b/src/react-elastic-carousel/components/Carousel.js
index cce5592..4df8200 100644
--- a/src/react-elastic-carousel/components/Carousel.js
+++ b/src/react-elastic-carousel/components/Carousel.js
@@ -17,6 +17,7 @@ import { pipe, noop, cssPrefix, numberToArray } from "../utils/helpers";
 import { Pagination } from "./Pagination";
 
 class Carousel extends React.Component {
+  isComponentMounted = false;
   state = {
     rootHeight: 0,
     childHeight: 0,
@@ -32,6 +33,7 @@ class Carousel extends React.Component {
   };
 
   componentDidMount() {
+    this.isComponentMounted = true;
     this.initResizeObserver();
     this.updateActivePage();
     this.setPages();
@@ -89,6 +91,8 @@ class Carousel extends React.Component {
   }
 
   componentWillUnmount() {
+    this.isComponentMounted = false;
+    this.removeAutoPlay();
     this.unSubscribeObserver();
   }
 
@@ -125,9 +129,11 @@ class Carousel extends React.Component {
   setAutoPlay = () => {
     const { autoPlaySpeed } = this.getDerivedPropsFromBreakPoint();
     this.autoPlayIntervalId = setInterval(() => {
-      const { transitioning } = this.state;
-      if (!transitioning) {
-        this.slideNext();
+      if (this.isComponentMounted) {
+        const { transitioning } = this.state;
+        if (!transitioning) {
+          this.slideNext();
+        }
       }
     }, autoPlaySpeed);
   };
@@ -200,7 +206,11 @@ class Carousel extends React.Component {
       // go back from 0ms to whatever set by the user
       // We were at 0ms because we wanted to disable animation on resize
       // see https://github.com/sag1v/react-elastic-carousel/issues/94
-      window.requestAnimationFrame(() => this.setState({ transitionMs }));
+      window.requestAnimationFrame(() => {
+        if (this.isComponentMounted) {
+          this.setState({ transitionMs });
+        }
+      });
       return {
         sliderPosition,
         activeIndex: newActiveIndex < 0 ? 0 : newActiveIndex
@@ -209,6 +219,10 @@ class Carousel extends React.Component {
   };
 
   onSliderResize = sliderNode => {
+    if (!this.isComponentMounted) {
+      return;
+    }
+
     const {
       verticalMode,
       children,
@@ -271,7 +285,10 @@ class Carousel extends React.Component {
     const containerWidth =
       newSliderContainerWidth - (initialVerticalMode ? 0 : outerSpacing * 2);
 
-    if (this.state.sliderContainerWidth === newSliderContainerWidth) {
+    if (
+      !this.isComponentMounted ||
+      this.state.sliderContainerWidth === newSliderContainerWidth
+    ) {
       // prevent infinite loop
       return;
     }