diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js
index dbce179..2ceba33 100644
--- a/src/views/Dashboard/DashboardProject.js
+++ b/src/views/Dashboard/DashboardProject.js
@@ -125,12 +125,11 @@ const DashboardProject = () => {
   const [dataGanttParents, setDataGanttParents] = useState({});
   const [isReadyGanttParents, setIsReadyGanttParents] = useState(false);
   const [calculationStatus, setCalculationStatus] = useState(false);
-  const [isHierarchy, setIsHierarchy] = useState(false);
+  const [isHierarchy, setIsHierarchy] = useState(null);
   let history = useHistory();
 
   useEffect(() => {
     getProjectDetail();
-    getSCurve();
     getOverdueActivities();
     getReportDistribution();
     getComments();
@@ -141,6 +140,17 @@ const DashboardProject = () => {
     };
   }, []);
 
+  useEffect(() => {
+    if (isHierarchy != null) {
+      getSCurve();
+    }
+    window.addEventListener("message", handleIframeMessage);
+
+    return () => {
+      window.removeEventListener("message", handleIframeMessage);
+    };
+  }, [isHierarchy]);
+
   useEffect(() => {
     if (activeTabIdx === 1) {
       initMap();
@@ -188,6 +198,8 @@ const DashboardProject = () => {
       setDataGantt(response);
       if (response.data.data.hierarchy_ftth_id) {
         setIsHierarchy(true);
+      } else {
+        setIsHierarchy(false);
       }
       setIsReadyGantt(true);
     } catch (error) {