diff --git a/optuna_dashboard/ts/components/GraphEdf.tsx b/optuna_dashboard/ts/components/GraphEdf.tsx
index 88af0105..e823311e 100644
--- a/optuna_dashboard/ts/components/GraphEdf.tsx
+++ b/optuna_dashboard/ts/components/GraphEdf.tsx
@@ -1,10 +1,11 @@
 import { Box, Typography, useTheme } from "@mui/material"
 import * as plotly from "plotly.js-dist-min"
-import React, { FC, useEffect, useMemo } from "react"
-import { StudyDetail, Trial } from "ts/types/optuna"
+import React, { FC, useEffect, useMemo, useState } from "react"
+import { GraphComponentState, StudyDetail, Trial } from "ts/types/optuna"
 import { CompareStudiesPlotType, getCompareStudiesPlotAPI } from "../apiClient"
 import { useBackendRender, usePlotlyColorTheme } from "../state"
 import { Target, useFilteredTrialsFromStudies } from "../trialFilter"
+import GraphContainer from "./GraphContainer"
 
 const getPlotDomId = (objectiveId: number) => `graph-edf-${objectiveId}`
 
@@ -27,6 +28,12 @@ export const GraphEdf: FC<{
 const GraphEdfBackend: FC<{
   studies: StudyDetail[]
 }> = ({ studies }) => {
+  const [graphComponentState, setGraphComponentState] =
+    useState<GraphComponentState>("componentWillMount")
+  useEffect(() => {
+    setGraphComponentState("componentDidMount")
+  }, [])
+
   const studyIds = studies.map((s) => s.id)
   const domId = getPlotDomId(-1)
   const numCompletedTrials = studies.reduce(
@@ -38,21 +45,36 @@ const GraphEdfBackend: FC<{
     if (studyIds.length === 0) {
       return
     }
-    getCompareStudiesPlotAPI(studyIds, CompareStudiesPlotType.EDF)
-      .then(({ data, layout }) => {
-        plotly.react(domId, data, layout)
-      })
-      .catch((err) => {
-        console.error(err)
-      })
-  }, [studyIds, numCompletedTrials])
-  return <Box component="div" id={domId} sx={{ height: "450px" }} />
+    if (graphComponentState !== "componentWillMount") {
+      getCompareStudiesPlotAPI(studyIds, CompareStudiesPlotType.EDF)
+        .then(({ data, layout }) => {
+          plotly.react(domId, data, layout).then(() => {
+            setGraphComponentState("graphDidRender")
+          })
+        })
+        .catch((err) => {
+          console.error(err)
+        })
+    }
+  }, [studyIds, numCompletedTrials, graphComponentState])
+  return (
+    <GraphContainer
+      plotDomId={domId}
+      graphComponentState={graphComponentState}
+    />
+  )
 }
 
 const GraphEdfFrontend: FC<{
   studies: StudyDetail[]
   objectiveId: number
 }> = ({ studies, objectiveId }) => {
+  const [graphComponentState, setGraphComponentState] =
+    useState<GraphComponentState>("componentWillMount")
+  useEffect(() => {
+    setGraphComponentState("componentDidMount")
+  }, [])
+
   const theme = useTheme()
   const colorTheme = usePlotlyColorTheme(theme.palette.mode)
 
@@ -71,8 +93,12 @@ const GraphEdfFrontend: FC<{
   })
 
   useEffect(() => {
-    plotEdf(edfPlotInfos, target, domId, colorTheme)
-  }, [studies, target, colorTheme])
+    if (graphComponentState !== "componentWillMount") {
+      plotEdf(edfPlotInfos, target, domId, colorTheme)?.then(() => {
+        setGraphComponentState("graphDidRender")
+      })
+    }
+  }, [studies, target, colorTheme, graphComponentState])
 
   return (
     <Box component="div">
@@ -82,7 +108,10 @@ const GraphEdfFrontend: FC<{
       >
         {`EDF for ${target.toLabel(studies[0].objective_names)}`}
       </Typography>
-      <Box component="div" id={domId} sx={{ height: "450px" }} />
+      <GraphContainer
+        plotDomId={domId}
+        graphComponentState={graphComponentState}
+      />
     </Box>
   )
 }
@@ -97,10 +126,9 @@ const plotEdf = (
     return
   }
   if (edfPlotInfos.length === 0) {
-    plotly.react(domId, [], {
+    return plotly.react(domId, [], {
       template: colorTheme,
     })
-    return
   }
 
   const target_name = "Objective Value"
@@ -143,5 +171,5 @@ const plotEdf = (
       y: yValues,
     }
   })
-  plotly.react(domId, plotData, layout)
+  return plotly.react(domId, plotData, layout)
 }