diff --git a/packages/asc-web-common/components/Loaders/ProfileViewLoader/ProfileViewLoader.js b/packages/asc-web-common/components/Loaders/ProfileViewLoader/ProfileViewLoader.js
index a0f050ddb1..d326e8a065 100644
--- a/packages/asc-web-common/components/Loaders/ProfileViewLoader/ProfileViewLoader.js
+++ b/packages/asc-web-common/components/Loaders/ProfileViewLoader/ProfileViewLoader.js
@@ -179,9 +179,11 @@ const ProfileViewLoader = ({ id, className, style, isEdit, ...rest }) => {
         />
       </StyledBox1>
       <RectangleLoader
+        className="rectangle-loader"
         title={title}
         width="100%"
         height="80"
+        style={{ maxWidth: "420px" }}
         borderRadius={borderRadius}
         backgroundColor={backgroundColor}
         foregroundColor={foregroundColor}
diff --git a/products/ASC.People/Client/src/pages/My/index.js b/products/ASC.People/Client/src/pages/My/index.js
index b401e27481..3cece3f231 100644
--- a/products/ASC.People/Client/src/pages/My/index.js
+++ b/products/ASC.People/Client/src/pages/My/index.js
@@ -19,9 +19,19 @@ import EditBodyContent from "../ProfileAction/Section/Body";
 
 class My extends React.Component {
   componentDidMount() {
-    const { fetchProfile, profile, location, t, setDocumentTitle } = this.props;
+    const {
+      fetchProfile,
+      profile,
+      location,
+      t,
+      setDocumentTitle,
+      setLoadedProfile,
+      setIsLoading,
+      setFirstLoad,
+    } = this.props;
 
     setDocumentTitle(t("Common:Profile"));
+    setFirstLoad(false);
 
     this.documentElement = document.getElementsByClassName("hidingHeader");
     const queryString = ((location && location.search) || "").slice(1);
@@ -35,7 +45,12 @@ class My extends React.Component {
       toastr.success(t("ChangeEmailSuccess"));
     }
     if (!profile) {
-      fetchProfile("@self");
+      setIsLoading(true);
+      setLoadedProfile(false);
+      fetchProfile("@self").finally(() => {
+        setIsLoading(false);
+        setLoadedProfile(true);
+      });
     }
 
     if (!profile && this.documentElement) {
@@ -59,26 +74,18 @@ class My extends React.Component {
     return (
       <PageLayout withBodyAutoFocus>
         <PageLayout.SectionHeader>
-          {profile && tReady ? (
-            isEdit ? (
-              <EditHeaderContent isMy={true} />
-            ) : (
-              <ViewHeaderContent isMy={true} />
-            )
+          {isEdit ? (
+            <EditHeaderContent isMy={true} tReady={tReady} />
           ) : (
-            <Loaders.SectionHeader />
+            <ViewHeaderContent isMy={true} tReady={tReady} />
           )}
         </PageLayout.SectionHeader>
 
         <PageLayout.SectionBody>
-          {profile && tReady ? (
-            isEdit ? (
-              <EditBodyContent isMy={true} />
-            ) : (
-              <ViewBodyContent isMy={true} />
-            )
+          {isEdit ? (
+            <EditBodyContent isMy={true} tReady={tReady} />
           ) : (
-            <Loaders.ProfileView />
+            <ViewBodyContent isMy={true} tReady={tReady} />
           )}
         </PageLayout.SectionBody>
       </PageLayout>
@@ -101,6 +108,9 @@ const MyProfile = withRouter(
     resetProfile: peopleStore.targetUserStore.resetTargetUser,
     fetchProfile: peopleStore.targetUserStore.getTargetUser,
     profile: peopleStore.targetUserStore.targetUser,
+    setLoadedProfile: peopleStore.loadingStore.setLoadedProfile,
+    setIsLoading: peopleStore.loadingStore.setIsLoading,
+    setFirstLoad: peopleStore.loadingStore.setFirstLoad,
   }))(withTranslation(["Profile", "ProfileAction"])(observer(My)))
 );
 
diff --git a/products/ASC.People/Client/src/pages/ProfileAction/Section/Header/index.js b/products/ASC.People/Client/src/pages/ProfileAction/Section/Header/index.js
index c7548039d4..515ca0a176 100644
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Header/index.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Header/index.js
@@ -83,7 +83,6 @@ const SectionHeaderContent = (props) => {
     }
 
     if (!isEditTargetUser && (!profile || !document.referrer)) {
-      console.log("here1");
       setFilterAndReset(filter);
       const urlFilter = filter.toUrlParams();
       return history.push(
@@ -91,8 +90,6 @@ const SectionHeaderContent = (props) => {
       );
     }
 
-    console.log("here2");
-
     history.push(
       combineUrl(
         AppServerConfig.proxyURL,