diff --git a/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx b/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
index 063065e8..99ede687 100644
--- a/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
+++ b/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
@@ -7,7 +7,8 @@ import values from 'utils/data/slider_values.json';
 import EventBus from 'utils/eventbus';
 
 const PreferencesWrapper = ({ children, ...props }) => {
-  const [shown, setShown] = useState(localStorage.getItem(props.setting) === 'true');
+  const [shown, setShown] = useState(localStorage.getItem(props.setting) === 'true' || props.default || false);
+  console.log(props.default)
 
   EventBus.on('toggle', (setting) => {
     if (setting === props.setting) {
diff --git a/src/features/quote/options/Custom.jsx b/src/features/quote/options/Custom.jsx
new file mode 100644
index 00000000..88cc9897
--- /dev/null
+++ b/src/features/quote/options/Custom.jsx
@@ -0,0 +1,117 @@
+import variables from 'config/variables';
+import { useState } from 'react';
+import { MdCancel, MdAdd, MdOutlineFormatQuote } from 'react-icons/md';
+import TextareaAutosize from '@mui/material/TextareaAutosize';
+
+import { Row, Content, Action } from 'components/Layout/Settings';
+import { Button } from 'components/Elements';
+
+function CustomSettings() {
+  const [customQuote, setCustomQuote] = useState(getCustom());
+
+  function handleCustomQuote(e, index, type) {
+    const result = e.target.value;
+    const newCustomQuote = [...customQuote];
+    newCustomQuote[index][type] = result;
+    setCustomQuote(newCustomQuote);
+    localStorage.setItem('customQuote', JSON.stringify(newCustomQuote));
+    document.querySelector('.reminder-info').style.display = 'flex';
+    localStorage.setItem('showReminder', true);
+  }
+
+  function modifyCustomQuote(type, index) {
+    let newCustomQuote = [...customQuote];
+    if (type === 'add') {
+      newCustomQuote.push({ quote: '', author: '' });
+    } else {
+      newCustomQuote.splice(index, 1);
+    }
+    setCustomQuote(newCustomQuote);
+    localStorage.setItem('customQuote', JSON.stringify(newCustomQuote));
+  }
+
+  function getCustom() {
+    let data = JSON.parse(localStorage.getItem('customQuote'));
+    if (data === null) {
+      data = [];
+    }
+    return data;
+  }
+
+  const QUOTE_SECTION = 'modals.main.settings.sections.quote';
+
+  return (
+    <>
+      <Row final={true}>
+        <Content
+          title={variables.getMessage(`${QUOTE_SECTION}.custom`)}
+          subtitle={variables.getMessage(`${QUOTE_SECTION}.custom_subtitle`)}
+        />
+        <Action>
+          <Button
+            type="settings"
+            onClick={() => modifyCustomQuote('add')}
+            icon={<MdAdd />}
+            label={variables.getMessage(`${QUOTE_SECTION}.add`)}
+          />
+        </Action>
+      </Row>
+
+      {customQuote.length !== 0 ? (
+        <div className="messagesContainer">
+          {customQuote.map((_url, index) => (
+            <div className="messageMap" key={index}>
+              <div className="icon">
+                <MdOutlineFormatQuote />
+              </div>
+              <div className="messageText">
+                <TextareaAutosize
+                  value={customQuote[index].quote}
+                  placeholder={variables.getMessage('modals.main.settings.sections.quote.title')}
+                  onChange={(e) => handleCustomQuote(e, index, 'quote')}
+                  varient="outlined"
+                  style={{ fontSize: '22px', fontWeight: 'bold' }}
+                />
+                <TextareaAutosize
+                  value={customQuote[index].author}
+                  placeholder={variables.getMessage('modals.main.settings.sections.quote.author')}
+                  className="subtitle"
+                  onChange={(e) => handleCustomQuote(e, index, 'author')}
+                  varient="outlined"
+                />
+              </div>
+              <div>
+                <div className="messageAction">
+                  <Button
+                    type="settings"
+                    onClick={() => modifyCustomQuote('remove', index)}
+                    icon={<MdCancel />}
+                    label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+                  />
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      ) : (
+        <div className="photosEmpty">
+          <div className="emptyNewMessage">
+            <MdOutlineFormatQuote />
+            <span className="title">{variables.getMessage(`${QUOTE_SECTION}.no_quotes`)}</span>
+            <span className="subtitle">
+              {variables.getMessage('modals.main.settings.sections.message.add_some')}
+            </span>
+            <Button
+              type="settings"
+              onClick={() => modifyCustomQuote('add')}
+              icon={<MdAdd />}
+              label={variables.getMessage(`${QUOTE_SECTION}.add`)}
+            />
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
+
+export default CustomSettings;
diff --git a/src/features/quote/options/QuoteOptions.jsx b/src/features/quote/options/QuoteOptions.jsx
index bea0a237..aa3381b1 100644
--- a/src/features/quote/options/QuoteOptions.jsx
+++ b/src/features/quote/options/QuoteOptions.jsx
@@ -1,7 +1,8 @@
 import variables from 'config/variables';
-import React, { useState, useEffect } from 'react';
-import { MdCancel, MdAdd, MdSource, MdOutlineFormatQuote } from 'react-icons/md';
-import TextareaAutosize from '@mui/material/TextareaAutosize';
+
+import { useState, useEffect } from 'react';
+
+import { MdSource } from 'react-icons/md';
 
 import {
   Header,
@@ -12,59 +13,24 @@ import {
   PreferencesWrapper,
 } from 'components/Layout/Settings';
 import { Checkbox, Dropdown } from 'components/Form/Settings';
-import { Button } from 'components/Elements';
+
 import { useTab } from 'components/Elements/MainModal/backend/TabContext';
 
-import { toast } from 'react-toastify';
-import EventBus from 'utils/eventbus';
+import CustomSettings from './Custom';
+
 import defaults from './default';
 
 const QuoteOptions = () => {
-  const [quoteType, setQuoteType] = useState(localStorage.getItem('quoteType') || defaults.quoteType);
-  const [customQuote, setCustomQuote] = useState(getCustom());
-  const [sourceSection, setSourceSection] = useState(false);
-  const QUOTE_SECTION = 'modals.main.settings.sections.quote';
+  const [quoteType, setQuoteType] = useState(
+    localStorage.getItem('quoteType') || defaults.quoteType,
+  );
   const { subSection } = useTab();
 
   useEffect(() => {
     localStorage.setItem('quoteType', quoteType);
   }, [quoteType]);
 
-  function resetCustom() {
-    localStorage.setItem('customQuote', '[{"quote": "", "author": ""}]');
-    setCustomQuote([{ quote: '', author: '' }]);
-    toast(variables.getMessage('toasts.reset'));
-    EventBus.emit('refresh', 'background');
-  }
-
-  function handleCustomQuote(e, index, type) {
-    const result = e.target.value;
-    const newCustomQuote = [...customQuote];
-    newCustomQuote[index][type] = result;
-    setCustomQuote(newCustomQuote);
-    localStorage.setItem('customQuote', JSON.stringify(newCustomQuote));
-    document.querySelector('.reminder-info').style.display = 'flex';
-    localStorage.setItem('showReminder', true);
-  }
-
-  function modifyCustomQuote(type, index) {
-    let newCustomQuote = [...customQuote];
-    if (type === 'add') {
-      newCustomQuote.push({ quote: '', author: '' });
-    } else {
-      newCustomQuote.splice(index, 1);
-    }
-    setCustomQuote(newCustomQuote);
-    localStorage.setItem('customQuote', JSON.stringify(newCustomQuote));
-  }
-
-  function getCustom() {
-    let data = JSON.parse(localStorage.getItem('customQuote'));
-    if (data === null) {
-      data = [];
-    }
-    return data;
-  }
+  const QUOTE_SECTION = 'modals.main.settings.sections.quote';
 
   const ButtonOptions = () => {
     return (
@@ -139,92 +105,14 @@ const QuoteOptions = () => {
     );
   };
 
-  let customSettings;
-  if (quoteType === 'custom' && subSection === 'source') {
-    customSettings = (
-      <>
-        <Row final={true}>
-          <Content
-            title={variables.getMessage(`${QUOTE_SECTION}.custom`)}
-            subtitle={variables.getMessage(`${QUOTE_SECTION}.custom_subtitle`)}
-          />
-          <Action>
-            <Button
-              type="settings"
-              onClick={() => modifyCustomQuote('add')}
-              icon={<MdAdd />}
-              label={variables.getMessage(`${QUOTE_SECTION}.add`)}
-            />
-          </Action>
-        </Row>
-
-        {customQuote.length !== 0 ? (
-          <div className="messagesContainer">
-            {customQuote.map((_url, index) => (
-              <div className="messageMap" key={index}>
-                <div className="icon">
-                  <MdOutlineFormatQuote />
-                </div>
-                <div className="messageText">
-                  <TextareaAutosize
-                    value={customQuote[index].quote}
-                    placeholder={variables.getMessage('modals.main.settings.sections.quote.title')}
-                    onChange={(e) => handleCustomQuote(e, index, 'quote')}
-                    varient="outlined"
-                    style={{ fontSize: '22px', fontWeight: 'bold' }}
-                  />
-                  <TextareaAutosize
-                    value={customQuote[index].author}
-                    placeholder={variables.getMessage('modals.main.settings.sections.quote.author')}
-                    className="subtitle"
-                    onChange={(e) => handleCustomQuote(e, index, 'author')}
-                    varient="outlined"
-                  />
-                </div>
-                <div>
-                  <div className="messageAction">
-                    <Button
-                      type="settings"
-                      onClick={() => modifyCustomQuote('remove', index)}
-                      icon={<MdCancel />}
-                      label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
-                    />
-                  </div>
-                </div>
-              </div>
-            ))}
-          </div>
-        ) : (
-          <div className="photosEmpty">
-            <div className="emptyNewMessage">
-              <MdOutlineFormatQuote />
-              <span className="title">{variables.getMessage(`${QUOTE_SECTION}.no_quotes`)}</span>
-              <span className="subtitle">
-                {variables.getMessage('modals.main.settings.sections.message.add_some')}
-              </span>
-              <Button
-                type="settings"
-                onClick={() => modifyCustomQuote('add')}
-                icon={<MdAdd />}
-                label={variables.getMessage(`${QUOTE_SECTION}.add`)}
-              />
-            </div>
-          </div>
-        )}
-      </>
-    );
-  } else {
-    // api
-    customSettings = <></>;
-  }
-
   return (
     <>
       {subSection === 'source' ? (
         <Header
           title={variables.getMessage(`${QUOTE_SECTION}.title`)}
-          secondaryTitle={variables.getMessage('modals.main.settings.sections.background.source.title')}
-          goBack={() => setSourceSection(false)}
+          secondaryTitle={variables.getMessage(
+            'modals.main.settings.sections.background.source.title',
+          )}
           report={false}
         />
       ) : (
@@ -248,9 +136,11 @@ const QuoteOptions = () => {
           </Action>
         </Row>
       )}
+
       {subSection !== 'source' && (
         <PreferencesWrapper
           setting="quote"
+          default={defaults.quote}
           zoomSetting="zoomQuote"
           category="quote"
           visibilityToggle={true}
@@ -260,7 +150,6 @@ const QuoteOptions = () => {
             icon={<MdSource />}
             title={variables.getMessage('modals.main.settings.sections.background.source.title')}
             subtitle={variables.getMessage(`${QUOTE_SECTION}.source_subtitle`)}
-            onClick={() => setSourceSection(true)}
           >
             <SourceDropdown />
           </Section>
@@ -268,7 +157,8 @@ const QuoteOptions = () => {
           <AdditionalOptions />
         </PreferencesWrapper>
       )}
-      {customSettings}
+
+      {quoteType === 'custom' && subSection === 'source' && <CustomSettings />}
     </>
   );
 };
diff --git a/src/features/quote/options/default.js b/src/features/quote/options/default.js
index f260b20a..8e026a26 100644
--- a/src/features/quote/options/default.js
+++ b/src/features/quote/options/default.js
@@ -1,5 +1,5 @@
 const DefaultOptions = {
-  quote: false,
+  quote: true,
   quoteType: 'api',
   customQuote: [],
   copyButton: false,
diff --git a/src/features/welcome/components/Sections/Final.jsx b/src/features/welcome/components/Sections/Final.jsx
index bf917ee9..351f9b4f 100644
--- a/src/features/welcome/components/Sections/Final.jsx
+++ b/src/features/welcome/components/Sections/Final.jsx
@@ -1,6 +1,7 @@
 import variables from 'config/variables';
 import languages from '@/i18n/languages.json';
 import { Header, Content } from '../Layout';
+import defaults from 'config/default';
 
 function Final(props) {
   return (
@@ -17,7 +18,7 @@ function Final(props) {
         <div className="toggle" onClick={() => props.switchTab(1)}>
           <span>
             {variables.getMessage('modals.main.settings.sections.language.title')}:{' '}
-            {languages.find((i) => i.value === localStorage.getItem('language')).name}
+            {languages.find((i) => i.value === localStorage.getItem('language') || defaults.language).name}
           </span>
         </div>
         <div className="toggle" onClick={() => props.switchTab(3)}>