diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/index.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/index.js
index 46edccf846..97d3f98a41 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/index.js
@@ -56,6 +56,7 @@ const RepeatableComponent = ({
   }, [componentValueLength]);
 
   const { collapses } = state.toJS();
+
   const toggleCollapses = index => {
     dispatch({
       type: 'TOGGLE_COLLAPSE',
@@ -79,6 +80,7 @@ const RepeatableComponent = ({
       )}
       <div ref={drop}>
         {componentValueLength > 0 &&
+          componentValueLength === collapses.length &&
           componentValue.map((data, index) => {
             const componentFieldName = `${name}.${index}`;
             const doesPreviousFieldContainErrorsAndIsOpen =
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/reducer.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/reducer.js
index 8bc0e2b62f..5491b59607 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/reducer.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/reducer.js
@@ -37,7 +37,7 @@ const reducer = (state, action) => {
 
           const newCollapses = Array.from({ length: collapsesLength }).map((_, i) => {
             const shouldOpenLastCollapse = state.get('shouldOpenLastCollapse');
-            const isOpen = shouldOpenLastCollapse && i === action.dataLength.length - 1;
+            const isOpen = shouldOpenLastCollapse && i === action.dataLength - 1;
 
             return {
               isOpen,