diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
index 27c2d41ab6..2821765842 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
@@ -253,9 +253,13 @@ const EditViewDataManagerProvider = ({
 
   const createFormData = useCallback(
     data => {
-      const cleanedData = removeKeyInObject(
-        cleanData(data, currentContentTypeLayout, allLayoutData.components),
-        '__temp_key__'
+      // First we need to remove the added keys needed for the dnd
+      const preparedData = removeKeyInObject(cloneDeep(data), '__temp_key__');
+      // Then we need to apply our helper
+      const cleanedData = cleanData(
+        preparedData,
+        currentContentTypeLayout,
+        allLayoutData.components
       );
 
       return cleanedData;