diff --git a/src/attributes/components/AttributePage/AttributePage.tsx b/src/attributes/components/AttributePage/AttributePage.tsx
index 5304b3a2b..847a63e75 100644
--- a/src/attributes/components/AttributePage/AttributePage.tsx
+++ b/src/attributes/components/AttributePage/AttributePage.tsx
@@ -96,11 +96,8 @@ const AttributePage: React.FC<AttributePageProps> = ({
   const intl = useIntl();
   const navigate = useNavigator();
 
-  const {
-    isMetadataModified,
-    isPrivateMetadataModified,
-    makeChangeHandler: makeMetadataChangeHandler,
-  } = useMetadataChangeTrigger();
+  const { makeChangeHandler: makeMetadataChangeHandler } =
+    useMetadataChangeTrigger();
 
   const initialForm: AttributePageFormData = !attribute
     ? {
@@ -137,15 +134,10 @@ const AttributePage: React.FC<AttributePageProps> = ({
       };
 
   const handleSubmit = (data: AttributePageFormData) => {
-    const metadata = !attribute || isMetadataModified ? data.metadata : [];
     const type = attribute === null ? data.type : undefined;
-    const privateMetadata =
-      !attribute || isPrivateMetadataModified ? data.privateMetadata : [];
 
     return onSubmit({
       ...data,
-      metadata,
-      privateMetadata,
       slug: data.slug || slugify(data.name).toLowerCase(),
       type,
     });
@@ -219,7 +211,11 @@ const AttributePage: React.FC<AttributePageProps> = ({
                   </>
                 )}
                 <CardSpacer />
-                <Metadata data={data} onChange={changeMetadata} />
+                <Metadata
+                  data={data}
+                  isLoading={disabled}
+                  onChange={changeMetadata}
+                />
               </DetailPageLayout.Content>
               <DetailPageLayout.RightSidebar>
                 <AttributeOrganization