diff --git a/src/components/NewsletterForm/index.tsx b/src/components/NewsletterForm/index.tsx
index 441de5c2e..dcd30acad 100644
--- a/src/components/NewsletterForm/index.tsx
+++ b/src/components/NewsletterForm/index.tsx
@@ -65,7 +65,7 @@ const NewsletterForm: React.FC<NewsletterFormProps> = ({
             />
             <Envelope className="absolute left-3 top-[50%] h-6 w-6 translate-y-[-50%]" color={globeColorClass} />
           </div>
-          <button className="group mt-2 flex items-center justify-center rounded-large bg-light-pink-vibrant p-3 sm:w-32 transition hover:bg-dark-accent-2 dark:bg-dark-pink-vibrant hover:dark:bg-light-accent-2 sm:ml-2 sm:mt-0 w-full px-0 sm:px-3">
+          <button className="group mt-2 flex items-center justify-center rounded-large bg-light-pink-vibrant p-3 sm:w-32 transition hover:bg-dark-accent-2 dark:bg-dark-pink-vibrant hover:dark:bg-light-accent-2 sm:ml-2 sm:mt-0 w-full !px-0 sm:!px-3">
             <span className="button-label-1 text-white transition group-hover:text-dark-accent-1 group-hover:dark:text-light-accent-1">
               Submit
             </span>
diff --git a/src/components/ThemeSwitch/index.tsx b/src/components/ThemeSwitch/index.tsx
index 7f12fe5aa..e67f1aef5 100644
--- a/src/components/ThemeSwitch/index.tsx
+++ b/src/components/ThemeSwitch/index.tsx
@@ -16,6 +16,7 @@ const ThemeSwitch: FC<{ className?: string }> = ({ className }) => {
 
       if (!currentTheme) {
         ThemeManager.set('light')
+        setTheme('light')
       } else {
         setTheme(currentTheme)
       }