diff --git a/src/components/form/CustomCopyrightForm.jsx b/src/components/form/CustomCopyrightForm.jsx
index 8f6b92c65..dffd9e1b5 100644
--- a/src/components/form/CustomCopyrightForm.jsx
+++ b/src/components/form/CustomCopyrightForm.jsx
@@ -123,7 +123,7 @@ export const ClausesDescriptions = ({ clauses }) => {
             return null
           } else if (key === 'expirationDateExists') {
             return (
-              <>
+              <React.Fragment key={key}>
                 <li key={key}>
                   {clauseLabels[key]}: {descriptions[key][value]}
                 </li>
@@ -140,7 +140,7 @@ export const ClausesDescriptions = ({ clauses }) => {
                       )
                     : 'None'}
                 </li>
-              </>
+              </React.Fragment>
             )
           } else if (key === 'addendum') {
             return <li key={key}>Addendum: {value ? '✅ Yes' : '🚫 No'}</li>
diff --git a/src/components/form/Form.jsx b/src/components/form/Form.jsx
index 7ebfba6fa..810257804 100644
--- a/src/components/form/Form.jsx
+++ b/src/components/form/Form.jsx
@@ -15,14 +15,6 @@ function Form({ fields, defaultValues, children, onSubmit, onReset }) {
     formState: { errors },
   } = useFormContext()
 
-  // Watch all form values and update mintStore
-  const formValues = watch()
-  useEffect(() => {
-    if (Object.keys(formValues).length > 0) {
-      useMintStore.setState(formValues)
-    }
-  }, [formValues])
-
   return (
     <form style={{ width: '100%' }} onSubmit={handleSubmit(onSubmit)}>
       {fields.map((f) => {
diff --git a/src/components/form/MintForm.jsx b/src/components/form/MintForm.jsx
index f66b7d357..d8ed39c0a 100644
--- a/src/components/form/MintForm.jsx
+++ b/src/components/form/MintForm.jsx
@@ -31,12 +31,13 @@ export default function MintForm() {
     isMonoType,
   } = useOutletContext()
   const navigate = useNavigate()
-  const { control } = useFormContext()
-  const { defaultValues } = useFormState({ control })
   const [needsCover, setNeedsCover] = useState(false)
   const [isTypedArt, setIsTypedArt] = useState(false)
   const [preview, setPreview] = useState(null)
 
+  // Get the current state from the mint store
+  const mintStoreState = useMintStore((state) => state)
+
   // Dynamically update conditional fields
   const fields = useMemo(() => {
     return mint_fields({
@@ -135,7 +136,7 @@ export default function MintForm() {
         </div>
       )}
       <Form
-        defaultValues={defaultValues}
+        defaultValues={mintStoreState}
         onSubmit={onSubmit}
         onReset={useMintStore.getState().reset}
         fields={fields}
diff --git a/src/components/preview/index.jsx b/src/components/preview/index.jsx
index 771b85a6e..885a2f4f7 100644
--- a/src/components/preview/index.jsx
+++ b/src/components/preview/index.jsx
@@ -70,8 +70,6 @@ export const Preview = () => {
     st.isMonoType,
   ])
 
-  console.log('customLicenseData in Preview', customLicenseData)
-
   const { ignoreUriMap } = useSettings()
   const token_tags = tags
     ? tags === ''