diff --git a/src/attributes/components/AttributePage/AttributePage.tsx b/src/attributes/components/AttributePage/AttributePage.tsx
index 2aa7aa0c9..9fe12bdb0 100644
--- a/src/attributes/components/AttributePage/AttributePage.tsx
+++ b/src/attributes/components/AttributePage/AttributePage.tsx
@@ -119,16 +119,12 @@ const AttributePage: React.FC<AttributePageProps> = ({
         };
 
   const handleSubmit = (data: AttributePageFormData) => {
-    const metadata = !attribute
-      ? data.metadata
-      : isMetadataModified
-      ? data.metadata
-      : undefined;
-    const privateMetadata = !attribute
-      ? data.privateMetadata
-      : isPrivateMetadataModified
-      ? data.privateMetadata
-      : undefined;
+    const metadata =
+      !attribute || isMetadataModified ? data.metadata : undefined;
+    const privateMetadata =
+      !attribute || isPrivateMetadataModified
+        ? data.privateMetadata
+        : undefined;
 
     onSubmit({
       ...data,