diff --git a/src/app/account/preferences.tsx b/src/app/account/preferences.tsx
index 950a4b6b..c779db21 100644
--- a/src/app/account/preferences.tsx
+++ b/src/app/account/preferences.tsx
@@ -113,16 +113,14 @@ const AccountPreferences = ({
                     'https://www.youtube.com/watch?v=xvFZjo5PgG0',
                     '_blank',
                   );
-                  return;
+                  return false;
                 }
                 /* April fools */
-                if (colorScheme !== 'dark') {
-                  if (confirm(darkThemeMessage)) {
-                    toggleColorScheme();
-                  }
-                } else {
-                  toggleColorScheme();
+                if (colorScheme !== 'dark' && !confirm(darkThemeMessage)) {
+                  return false;
                 }
+                toggleColorScheme();
+                return true;
               }}
             />
             <h5>{lang('Språk', 'Language')}</h5>
diff --git a/src/components/input/switch.tsx b/src/components/input/switch.tsx
index cd71480f..0335f043 100644
--- a/src/components/input/switch.tsx
+++ b/src/components/input/switch.tsx
@@ -44,8 +44,10 @@ const Switch = ({
   }, [value]);
 
   const handleClick = () => {
-    onChange?.(!checked);
-    setChecked(!checked);
+    const changed = onChange?.(!checked);
+    if (changed) {
+      setChecked(!checked);
+    }
   };
 
   return (