diff --git a/packages/web/pages/settings/integrations.tsx b/packages/web/pages/settings/integrations.tsx
index 2e1e17d9b..c9f2e3296 100644
--- a/packages/web/pages/settings/integrations.tsx
+++ b/packages/web/pages/settings/integrations.tsx
@@ -172,25 +172,23 @@ export default function Integrations(): JSX.Element {
       try {
         // get the token from query string
         const token = router.query.code as string
-        const result = await setIntegrationMutation({
+        await setIntegrationMutation({
           token,
           name: 'NOTION',
           type: 'EXPORT',
           enabled: true,
         })
-        if (result) {
-          revalidate()
-          showSuccessToast('Connected with Notion.')
-        } else {
-          showErrorToast('There was an error connecting to Notion.')
-        }
+
+        showSuccessToast('Connected with Notion.')
+
+        router.push('/settings/integrations/notion')
       } catch (err) {
         showErrorToast(
           'There was an error connecting to Notion. Please try again.',
           { duration: 5000 }
         )
-      } finally {
-        router.push('/settings/integrations/notion')
+
+        router.push('/settings/integrations')
       }
     }
 
diff --git a/packages/web/pages/settings/integrations/notion.tsx b/packages/web/pages/settings/integrations/notion.tsx
index 9f5e7f8f1..eb56fa892 100644
--- a/packages/web/pages/settings/integrations/notion.tsx
+++ b/packages/web/pages/settings/integrations/notion.tsx
@@ -12,7 +12,7 @@ import 'antd/dist/antd.compact.css'
 import { CheckboxValueType } from 'antd/lib/checkbox/Group'
 import Image from 'next/image'
 import { useRouter } from 'next/router'
-import { useMemo } from 'react'
+import { useEffect, useState } from 'react'
 import { HStack, VStack } from '../../../components/elements/LayoutPrimitives'
 import { PageMetaData } from '../../../components/patterns/PageMetaData'
 import { Beta } from '../../../components/templates/Beta'
@@ -20,18 +20,13 @@ import { Header } from '../../../components/templates/settings/SettingsTable'
 import { SettingsLayout } from '../../../components/templates/SettingsLayout'
 import { deleteIntegrationMutation } from '../../../lib/networking/mutations/deleteIntegrationMutation'
 import { setIntegrationMutation } from '../../../lib/networking/mutations/setIntegrationMutation'
-import { useGetIntegrationsQuery } from '../../../lib/networking/queries/useGetIntegrationsQuery'
+import {
+  Integration,
+  useGetIntegrationsQuery,
+} from '../../../lib/networking/queries/useGetIntegrationsQuery'
 import { applyStoredTheme } from '../../../lib/themeUpdater'
 import { showSuccessToast } from '../../../lib/toastHelpers'
 
-interface FieldData {
-  name: string | number | (string | number)[]
-  value?: any
-  checked?: boolean
-  validating?: boolean
-  errors?: string[]
-}
-
 type FieldType = {
   parentPageId?: string
   parentDatabaseId?: string
@@ -44,35 +39,28 @@ export default function Notion(): JSX.Element {
 
   const router = useRouter()
   const { integrations, revalidate } = useGetIntegrationsQuery()
-  const notion = useMemo(
-    () => integrations.find((i) => i.name == 'NOTION' && i.type == 'EXPORT'),
-    [integrations]
-  )
-  const fields = useMemo<FieldData[]>(
-    () => [
-      {
-        name: 'parentPageId',
-        value: notion?.settings?.parentPageId,
-      },
-      {
-        name: 'parentDatabaseId',
-        value: notion?.settings?.parentDatabaseId,
-      },
-      {
-        name: 'autoSync',
-        value: notion?.settings?.autoSync,
-      },
-      {
-        name: 'properties',
-        value: notion?.settings?.properties,
-      },
-    ],
-    [notion]
-  )
+  const [notion, setNotion] = useState<Integration>()
 
   const [form] = Form.useForm<FieldType>()
   const [messageApi, contextHolder] = message.useMessage()
 
+  useEffect(() => {
+    const notion = integrations.find(
+      (i) => i.name == 'NOTION' && i.type == 'EXPORT'
+    )
+
+    if (notion) {
+      setNotion(notion)
+
+      form.setFieldsValue({
+        parentPageId: notion.settings?.parentPageId,
+        parentDatabaseId: notion.settings?.parentDatabaseId,
+        autoSync: notion.settings?.autoSync,
+        properties: notion.settings?.properties,
+      })
+    }
+  }, [form, integrations])
+
   const deleteNotion = async () => {
     if (!notion) {
       throw new Error('Notion integration not found')
@@ -156,7 +144,6 @@ export default function Notion(): JSX.Element {
                 wrapperCol={{ span: 8 }}
                 labelAlign="left"
                 form={form}
-                fields={fields}
                 onFinish={onFinish}
                 onFinishFailed={onFinishFailed}
               >
@@ -201,18 +188,16 @@ export default function Notion(): JSX.Element {
                 </Form.Item>
 
                 <Form.Item>
-                  <Button type="primary" htmlType="submit">
-                    Save
-                  </Button>
+                  <Space>
+                    <Button type="primary" htmlType="submit">
+                      Save
+                    </Button>
+                    <Button type="primary" danger onClick={deleteNotion}>
+                      Disconnect
+                    </Button>
+                  </Space>
                 </Form.Item>
               </Form>
-
-              <Space>
-                <Button type="primary">Export Recent Items</Button>
-                <Button type="primary" danger onClick={deleteNotion}>
-                  Disconnect
-                </Button>
-              </Space>
             </div>
           )}
         </VStack>