diff --git a/src/components/withCurrentUserPersonalDetails.js b/src/components/withCurrentUserPersonalDetails.js
index 87a046e66983..7a47ea7cc712 100644
--- a/src/components/withCurrentUserPersonalDetails.js
+++ b/src/components/withCurrentUserPersonalDetails.js
@@ -36,7 +36,8 @@ export default function (WrappedComponent) {
 
     function WithCurrentUserPersonalDetails(props) {
         const accountID = props.session.accountID;
-        const currentUserPersonalDetails = useMemo(() => ({...props.personalDetails[accountID], accountID}), [props.personalDetails, accountID]);
+        const accountPersonalDetails = props.personalDetails[accountID];
+        const currentUserPersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 913d085f9428..6c588698ce9d 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -62,6 +62,13 @@ const localeProviderDefaultProps = {
 };
 
 class LocaleContextProvider extends React.Component {
+    shouldComponentUpdate(nextProps) {
+        return (
+            nextProps.preferredLocale !== this.props.preferredLocale ||
+            lodashGet(nextProps, 'currentUserPersonalDetails.timezone.selected') !== lodashGet(this.props, 'currentUserPersonalDetails.timezone.selected')
+        );
+    }
+
     /**
      * The context this component exposes to child components
      * @returns {object} translation util functions and locale