diff --git a/ui/page/settings/view.jsx b/ui/page/settings/view.jsx
index 7fb5619cb..78bb85048 100644
--- a/ui/page/settings/view.jsx
+++ b/ui/page/settings/view.jsx
@@ -195,6 +195,11 @@ class SettingsPage extends React.PureComponent<Props, State> {
         }}
         className="card-stack"
       >
+        <Card title={__('Language')} actions={<SettingLanguage />} />
+        {homepages && Object.keys(homepages).length > 1 && (
+          <Card title={__('Homepage')} actions={<HomepageSelector />} />
+        )}
+
         {!isAuthenticated && IS_WEB && (
           <div className="main--empty">
             <Yrbl
@@ -216,10 +221,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
           </section>
         ) : (
           <div className={classnames({ 'card--disabled': IS_WEB && !isAuthenticated })}>
-            <Card title={__('Language')} actions={<SettingLanguage />} />
-            {homepages && Object.keys(homepages).length > 1 && (
-              <Card title={__('Homepage')} actions={<HomepageSelector />} />
-            )}
             {isAuthenticated && <SettingAccountPassword />}
             {/* @if TARGET='app' */}
             <Card
diff --git a/ui/redux/actions/settings.js b/ui/redux/actions/settings.js
index a174c13bd..cfe5c3328 100644
--- a/ui/redux/actions/settings.js
+++ b/ui/redux/actions/settings.js
@@ -143,7 +143,7 @@ export function doSetClientSetting(key, value, pushPrefs) {
     const state = getState();
     const ready = selectPrefsReady(state);
 
-    if (!ready) {
+    if (!ready && pushPrefs) {
       return dispatch(doAlertWaitingForSync());
     }
 
@@ -154,6 +154,7 @@ export function doSetClientSetting(key, value, pushPrefs) {
         value,
       },
     });
+
     if (pushPrefs) {
       dispatch(doPushSettingsToPrefs());
     }