diff --git a/src/@hooks/useSiteMetadata/index.ts b/src/@hooks/useSiteMetadata/index.ts
index 14375221b..40f9d3259 100644
--- a/src/@hooks/useSiteMetadata/index.ts
+++ b/src/@hooks/useSiteMetadata/index.ts
@@ -9,4 +9,4 @@ export function useSiteMetadata(): UseSiteMetadata {
   }
 
   return siteMeta
-}
\ No newline at end of file
+}
diff --git a/src/components/Publish/FormPublish/Pricing/index.tsx b/src/components/Publish/FormPublish/Pricing/index.tsx
index 130549554..b047507d8 100644
--- a/src/components/Publish/FormPublish/Pricing/index.tsx
+++ b/src/components/Publish/FormPublish/Pricing/index.tsx
@@ -32,7 +32,8 @@ export default function PricingFields(): ReactElement {
 
   // Always update everything when price value changes
   useEffect(() => {
-    if (type === 'fixed') return
+    if (type === 'fixed' || type === 'free') return
+
     const dtAmount =
       isValidNumber(oceanAmount) &&
       isValidNumber(weightOnOcean) &&
@@ -72,7 +73,7 @@ export default function PricingFields(): ReactElement {
     <Tabs
       items={tabs}
       handleTabChange={handleTabChange}
-      defaultIndex={type === 'fixed' ? 0 : 1}
+      defaultIndex={type === 'fixed' ? 0 : type === 'dynamic' ? 1 : 2}
       className={styles.pricing}
     />
   )