diff --git a/src/components/pages/Publish/FormAlgoPublish.tsx b/src/components/pages/Publish/FormAlgoPublish.tsx
index 58490e121..9f11369ff 100644
--- a/src/components/pages/Publish/FormAlgoPublish.tsx
+++ b/src/components/pages/Publish/FormAlgoPublish.tsx
@@ -7,6 +7,8 @@ import Input from '../../atoms/Input'
 import Button from '../../atoms/Button'
 import { FormContent, FormFieldProps } from '../../../@types/Form'
 import { MetadataPublishFormAlgorithm } from '../../../@types/MetaData'
+import { initialValues as initialValuesAlgorithm } from '../../../models/FormAlgoPublish'
+
 import stylesIndex from './index.module.css'
 
 const query = graphql`
@@ -115,7 +117,10 @@ export default function FormPublish(): ReactElement {
 
   const resetFormAndClearStorage = (e: FormEvent<Element>) => {
     e.preventDefault()
-    resetForm({ values: initialValues, status: 'empty' })
+    resetForm({
+      values: initialValuesAlgorithm as MetadataPublishFormAlgorithm,
+      status: 'empty'
+    })
     setStatus('empty')
   }
 
diff --git a/src/components/pages/Publish/FormPublish.tsx b/src/components/pages/Publish/FormPublish.tsx
index 7433e573a..eafd635c8 100644
--- a/src/components/pages/Publish/FormPublish.tsx
+++ b/src/components/pages/Publish/FormPublish.tsx
@@ -7,6 +7,7 @@ import Input from '../../atoms/Input'
 import Button from '../../atoms/Button'
 import { FormContent, FormFieldProps } from '../../../@types/Form'
 import { MetadataPublishFormDataset } from '../../../@types/MetaData'
+import { initialValues as initialValuesDataset } from '../../../models/FormAlgoPublish'
 import stylesIndex from './index.module.css'
 
 const query = graphql`
@@ -73,7 +74,10 @@ export default function FormPublish(): ReactElement {
 
   const resetFormAndClearStorage = (e: FormEvent<Element>) => {
     e.preventDefault()
-    resetForm({ values: initialValues, status: 'empty' })
+    resetForm({
+      values: initialValuesDataset as MetadataPublishFormDataset,
+      status: 'empty'
+    })
     setStatus('empty')
   }
 
diff --git a/src/components/pages/Publish/index.tsx b/src/components/pages/Publish/index.tsx
index fd9ddd030..38483705d 100644
--- a/src/components/pages/Publish/index.tsx
+++ b/src/components/pages/Publish/index.tsx
@@ -1,5 +1,5 @@
 import React, { ReactElement, useState, useEffect } from 'react'
-import { Formik } from 'formik'
+import { Formik, FormikState } from 'formik'
 import { usePublish, useOcean } from '@oceanprotocol/react'
 import styles from './index.module.css'
 import FormPublish from './FormPublish'
@@ -75,10 +75,20 @@ export default function PublishPage({
   const [did, setDid] = useState<string>()
   const [algoInitialValues, setAlgoInitialValues] = useState<
     Partial<MetadataPublishFormAlgorithm>
-  >(initialValuesAlgorithm)
+  >(
+    (localStorage.getItem('ocean-publish-form-algorithms') &&
+      (JSON.parse(localStorage.getItem('ocean-publish-form-algorithms'))
+        .initialValues as MetadataPublishFormAlgorithm)) ||
+      initialValuesAlgorithm
+  )
   const [datasetInitialValues, setdatasetInitialValues] = useState<
     Partial<MetadataPublishFormDataset>
-  >(initialValues)
+  >(
+    (localStorage.getItem('ocean-publish-form-datasets') &&
+      (JSON.parse(localStorage.getItem('ocean-publish-form-datasets'))
+        .initialValues as MetadataPublishFormDataset)) ||
+      initialValues
+  )
   const [publishType, setPublishType] = useState<MetadataMain['type']>(
     'dataset'
   )
@@ -93,7 +103,9 @@ export default function PublishPage({
 
   async function handleSubmit(
     values: Partial<MetadataPublishFormDataset>,
-    resetForm: () => void
+    resetForm: (
+      nextState?: Partial<FormikState<Partial<MetadataPublishFormDataset>>>
+    ) => void
   ): Promise<void> {
     const metadata = transformPublishFormToMetadata(values)
     const timeout = mapTimeoutStringToSeconds(values.timeout)
@@ -127,7 +139,10 @@ export default function PublishPage({
       setSuccess(
         '🎉 Successfully published. 🎉 Now create a price on your data set.'
       )
-      resetForm()
+      resetForm({
+        values: initialValues as MetadataPublishFormDataset,
+        status: 'empty'
+      })
     } catch (error) {
       setError(error.message)
       Logger.error(error.message)
@@ -136,7 +151,9 @@ export default function PublishPage({
 
   async function handleAlgorithmSubmit(
     values: Partial<MetadataPublishFormAlgorithm>,
-    resetForm: () => void
+    resetForm: (
+      nextState?: Partial<FormikState<Partial<MetadataPublishFormAlgorithm>>>
+    ) => void
   ): Promise<void> {
     const metadata = transformPublishAlgorithmFormToMetadata(values)
 
@@ -160,7 +177,10 @@ export default function PublishPage({
       setSuccess(
         '🎉 Successfully published. 🎉 Now create a price for your algorithm.'
       )
-      resetForm()
+      resetForm({
+        values: initialValuesAlgorithm as MetadataPublishFormAlgorithm,
+        status: 'empty'
+      })
     } catch (error) {
       setError(error.message)
       Logger.error(error.message)