diff --git a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialog.tsx b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialog.tsx
index c0cc75b188..1f6d68179f 100644
--- a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialog.tsx
+++ b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialog.tsx
@@ -89,7 +89,7 @@ export const StepFormDialog: FC<Props> = ({
   }, [isOpen, onClickBack])
 
   return createPortal(
-    <StepFormDialogProvider firstStep={firstStep}>
+    <StepFormDialogProvider firstStep={firstStep} isOpen={isOpen}>
       <DialogContentInner
         {...rest}
         isOpen={isOpen}
diff --git a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogContentInner.tsx b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogContentInner.tsx
index d0fb3f25d3..e7e76e0bde 100644
--- a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogContentInner.tsx
+++ b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogContentInner.tsx
@@ -94,12 +94,7 @@ export const StepFormDialogContentInner: FC<StepFormDialogContentInnerProps> = (
 
   const handleCloseAction = useCallback(() => {
     onClickClose()
-    setTimeout(() => {
-      // HINT: ダイアログが閉じるtransitionが完了してから初期化をしている
-      stepQueue.current = []
-      setCurrentStep(firstStep)
-    }, 300)
-  }, [firstStep, stepQueue, setCurrentStep, onClickClose])
+  }, [onClickClose])
 
   const changeCurrentStep = useCallback(
     (step: Parameters<typeof setCurrentStep>[0]) => {
diff --git a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogProvider.tsx b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogProvider.tsx
index 5cb1050433..44571fa6aa 100644
--- a/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogProvider.tsx
+++ b/packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogProvider.tsx
@@ -33,11 +33,22 @@ export const StepFormDialogContext = createContext<StepFormDialogContextType>({
 type Props = {
   children: ReactNode
   firstStep: StepItem
+  isOpen: boolean
 }
-export const StepFormDialogProvider: FC<Props> = ({ children, firstStep }) => {
+export const StepFormDialogProvider: FC<Props> = ({ children, firstStep, isOpen }) => {
   const [currentStep, setCurrentStep] = useState<StepItem>(firstStep)
   const stepQueue = useRef<StepItem[]>([])
   const scrollerRef = useRef<HTMLDivElement>(null)
+  const prevIsOpen = useRef(isOpen)
+
+  // ダイアログが閉じたときにリセット
+  if (prevIsOpen.current && !isOpen) {
+    setTimeout(() => {
+      stepQueue.current = []
+      setCurrentStep(firstStep)
+    }, 300)
+  }
+  prevIsOpen.current = isOpen
 
   return (
     <StepFormDialogContext.Provider value={{ currentStep, stepQueue, setCurrentStep, scrollerRef }}>