diff --git a/ui/component/claimListHeader/index.js b/ui/component/claimListHeader/index.js
index 76701d135..d3b2fd0ed 100644
--- a/ui/component/claimListHeader/index.js
+++ b/ui/component/claimListHeader/index.js
@@ -2,8 +2,7 @@ import { connect } from 'react-redux';
 import { selectFetchingClaimSearch, SETTINGS, selectFollowedTags } from 'lbry-redux';
 import { doToggleTagFollowDesktop } from 'redux/actions/tags';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
-import { doSetClientSetting, doSyncClientSettings } from 'redux/actions/settings';
-
+import { doSetClientSetting } from 'redux/actions/settings';
 import ClaimListDiscover from './view';
 
 const select = state => ({
@@ -15,7 +14,6 @@ const select = state => ({
 const perform = {
   doToggleTagFollowDesktop,
   doSetClientSetting,
-  doSyncClientSettings,
 };
 
 export default connect(select, perform)(ClaimListDiscover);
diff --git a/ui/component/claimListHeader/view.jsx b/ui/component/claimListHeader/view.jsx
index fdb82e1fc..04659e055 100644
--- a/ui/component/claimListHeader/view.jsx
+++ b/ui/component/claimListHeader/view.jsx
@@ -29,9 +29,8 @@ type Props = {
   hiddenNsfwMessage?: Node,
   channelIds?: Array<string>,
   tileLayout: boolean,
-  doSetClientSetting: (string, boolean) => void,
+  doSetClientSetting: (string, boolean, ?boolean) => void,
   setPage: number => void,
-  doSyncClientSettings: () => void,
 };
 
 function ClaimListHeader(props: Props) {
@@ -53,7 +52,6 @@ function ClaimListHeader(props: Props) {
     channelIds,
     tileLayout,
     doSetClientSetting,
-    doSyncClientSettings,
     setPage,
   } = props;
   const { action, push, location } = useHistory();
@@ -241,8 +239,7 @@ function ClaimListHeader(props: Props) {
             {tileLayout !== undefined && (
               <Button
                 onClick={() => {
-                  doSetClientSetting(SETTINGS.TILE_LAYOUT, !tileLayout);
-                  doSyncClientSettings();
+                  doSetClientSetting(SETTINGS.TILE_LAYOUT, !tileLayout, true);
                 }}
                 button="alt"
                 className="button-toggle"
diff --git a/ui/component/notification/view.jsx b/ui/component/notification/view.jsx
index 392451aec..e641ea15d 100644
--- a/ui/component/notification/view.jsx
+++ b/ui/component/notification/view.jsx
@@ -122,7 +122,7 @@ export default function Notification(props: Props) {
 
           <div className="notification__extra">
             <div className="notification__time">
-              <DateTime timeAgo date={notification.created_at} />
+              <DateTime timeAgo date={notification.active_at} />
             </div>
             {!is_seen && <Button className="notification__mark-seen" onClick={handleSeeNotification} />}
           </div>
diff --git a/ui/component/userSignUp/index.js b/ui/component/userSignUp/index.js
index 52487da93..010a4f4dd 100644
--- a/ui/component/userSignUp/index.js
+++ b/ui/component/userSignUp/index.js
@@ -2,7 +2,7 @@ import REWARD_TYPES from 'rewards';
 import { connect } from 'react-redux';
 import { selectGetSyncIsPending, selectSyncHash } from 'lbryinc';
 import { doClaimRewardType } from 'redux/actions/rewards';
-import { doSyncClientSettings, doSetClientSetting } from 'redux/actions/settings';
+import { doSetClientSetting } from 'redux/actions/settings';
 import { selectClaimedRewards, makeSelectIsRewardClaimPending } from 'redux/selectors/rewards';
 import { doUserFetch } from 'redux/actions/user';
 import {
@@ -61,8 +61,7 @@ const perform = dispatch => ({
         notifyError: false,
       })
     ),
-  syncSettings: () => dispatch(doSyncClientSettings()),
-  setClientSetting: (setting, value) => dispatch(doSetClientSetting(setting, value)),
+  setClientSetting: (setting, value, pushToPrefs) => dispatch(doSetClientSetting(setting, value, pushToPrefs)),
   doToggleInterestedInYoutubeSync: () => dispatch(doToggleInterestedInYoutubeSync()),
 });
 
diff --git a/ui/component/userSignUp/view.jsx b/ui/component/userSignUp/view.jsx
index d26808b91..d7e5f6476 100644
--- a/ui/component/userSignUp/view.jsx
+++ b/ui/component/userSignUp/view.jsx
@@ -39,8 +39,7 @@ type Props = {
   hasSynced: boolean,
   syncingWallet: boolean,
   creatingChannel: boolean,
-  syncSettings: () => void,
-  setClientSetting: (string, boolean) => void,
+  setClientSetting: (string, boolean, ?boolean) => void,
   followingAcknowledged: boolean,
   tagsAcknowledged: boolean,
   rewardsAcknowledged: boolean,
@@ -68,7 +67,6 @@ function UserSignUp(props: Props) {
     followingAcknowledged,
     tagsAcknowledged,
     rewardsAcknowledged,
-    syncSettings,
     setClientSetting,
     interestedInYoutubeSync,
     doToggleInterestedInYoutubeSync,
@@ -128,8 +126,7 @@ function UserSignUp(props: Props) {
     canHijackSignInFlowWithSpinner && (isCurrentlyFetchingSomething || isWaitingForSomethingToFinish);
 
   function setSettingAndSync(setting, value) {
-    setClientSetting(setting, value);
-    syncSettings();
+    setClientSetting(setting, value, true);
   }
 
   React.useEffect(() => {
diff --git a/ui/page/settingsAdvanced/view.jsx b/ui/page/settingsAdvanced/view.jsx
index c28cb259d..3e113527e 100644
--- a/ui/page/settingsAdvanced/view.jsx
+++ b/ui/page/settingsAdvanced/view.jsx
@@ -53,7 +53,7 @@ type Props = {
   findingFFmpeg: boolean,
   findFFmpeg: () => void,
   language?: string,
-  syncSettings: () => void,
+  syncEnabled: boolean,
   enterSettings: () => void,
   exitSettings: () => void,
 };
@@ -412,6 +412,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                     placeholder={__('A Folder containing FFmpeg')}
                     currentPath={ffmpegPath || daemonSettings.ffmpeg_path}
                     onFileChosen={(newDirectory: WebFile) => {
+                      // $FlowFixMe
                       this.onFFmpegFolder(newDirectory.path);
                     }}
                     disabled={Boolean(ffmpegPath)}