diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
index 1a8552490c..602ef963ca 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/DataManagerProvider/index.js
@@ -138,6 +138,8 @@ const DataManagerProvider = ({ children }) => {
     return <Redirect to={`/plugins/${pluginId}/content-types/${firstCTUid}`} />;
   }
 
+  console.log({ modifiedData });
+
   return (
     <DataManagerContext.Provider
       value={{
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
index 2528567e53..1af9c0ac3a 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/index.js
@@ -1,5 +1,4 @@
 import React, { useEffect, useReducer, useRef, useState } from 'react';
-// import PropTypes from 'prop-types';
 import {
   ButtonModal,
   HeaderModal,
@@ -53,12 +52,10 @@ const FormModal = () => {
   const { formatMessage } = useGlobalContext();
   const query = useQuery();
   const attributeOptionRef = useRef();
-
   const {
     addAttribute,
     contentTypes,
     createSchema,
-    initialData,
     modifiedData: allDataSchema,
     sortedContentTypesList,
   } = useDataManager();
@@ -105,8 +102,6 @@ const FormModal = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [search]);
 
-  const displayedAttributes = getAttributes(state.forTarget);
-
   const form = get(forms, [state.modalType, 'form', state.settingType], () => ({
     items: [],
   }));
@@ -117,7 +112,6 @@ const FormModal = () => {
   const isCreating = state.actionType === 'create';
   const isOpen = !isEmpty(search);
   const isPickingAttribute = state.modalType === 'chooseAttribute';
-  const name = get(initialData, ['schema', 'name'], '');
   const uid = createUid(modifiedData.name || '');
 
   let headerId = isCreating
@@ -128,23 +122,26 @@ const FormModal = () => {
     headerId = null;
   }
 
-  const modalBodyStyle = isPickingAttribute
-    ? { paddingTop: '0.5rem', paddingBottom: '3rem' }
-    : {};
-
   const checkFormValidity = async () => {
     let schema;
 
     if (state.modalType === 'contentType') {
       schema = forms[state.modalType].schema(Object.keys(contentTypes));
-    } else if (state.modalType === 'attribute') {
+    } else if (
+      state.modalType === 'attribute' &&
+      state.forTarget !== 'components' &&
+      state.forTarget !== 'component'
+    ) {
       schema = forms[state.modalType].schema(
         allDataSchema,
         modifiedData.type,
         modifiedData
       );
     } else {
+      // TODO validate component schema
       console.log('Will do something');
+
+      return;
     }
 
     await schema.validate(modifiedData, { abortEarly: false });
@@ -286,6 +283,14 @@ const FormModal = () => {
     }
   };
 
+  // Display data
+  const displayedAttributes = getAttributes(state.forTarget);
+
+  // Styles
+  const modalBodyStyle = isPickingAttribute
+    ? { paddingTop: '0.5rem', paddingBottom: '3rem' }
+    : {};
+
   return (
     <Modal
       isOpen={isOpen}
@@ -416,7 +421,7 @@ const FormModal = () => {
                               return (
                                 <RelationForm
                                   key="relation"
-                                  mainBoxHeader={name}
+                                  mainBoxHeader={state.headerDisplayName}
                                   modifiedData={modifiedData}
                                   naturePickerType={state.forTarget}
                                   onChange={handleChange}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/attributes.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/attributes.js
index d2b2236236..4f5eb25dd8 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/attributes.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/attributes.js
@@ -1,4 +1,4 @@
-const getAttributes = () => {
+const getAttributes = (dataTarget = '') => {
   const defaultAttributes = [
     [
       'text',
@@ -14,10 +14,16 @@ const getAttributes = () => {
       // 'uid',
       'relation',
     ],
-    ['component', 'dynamiczone'],
+    ['component'],
   ];
 
-  return defaultAttributes;
+  const items = defaultAttributes.slice();
+
+  if (dataTarget !== 'component' && dataTarget !== 'components') {
+    items[1].push('dynamiczone');
+  }
+
+  return items;
 };
 
 export default getAttributes;