diff --git a/src/components/Main.jsx b/src/components/Main.jsx
index 9afadca7..ad7dd3d3 100644
--- a/src/components/Main.jsx
+++ b/src/components/Main.jsx
@@ -18,8 +18,9 @@ import Config from '@/config/config.export'
 
 export default function MainPage() {
   const [sessionState, setSessionState] = useRecoilState(sessionStore)
-  const [chagePasswordPopOpen, setChagePasswordPopOpen] = useState(false)
-
+  const [changePasswordPopOpen, setChangePasswordPopOpen] = useState(false)
+  // 데이터 확인 완료 여부 상태 추가
+  const [isSessionLoaded, setIsSessionLoaded] = useState(false)
   const router = useRouter()
   const { getMessage } = useMessage()
 
@@ -52,6 +53,14 @@ export default function MainPage() {
     }
   }
 
+  useEffect(() => {
+    if (isObjectNotEmpty(sessionState)) {
+      if (sessionState?.pwdInitYn !== 'Y') {
+        setChangePasswordPopOpen(true)
+      }
+    }
+  }, [sessionState])
+
   // 라디오 변경 이벤트
   const handleOnChangeRadio = (e) => {
     setSearchRadioType(e.target.value)
@@ -77,7 +86,7 @@ export default function MainPage() {
   useEffect(() => {
     if (isObjectNotEmpty(sessionState)) {
       if (sessionState?.pwdInitYn !== 'Y') {
-        setChagePasswordPopOpen(true)
+        setChangePasswordPopOpen(true)
       }
     }
   }, [sessionState])
@@ -86,10 +95,25 @@ export default function MainPage() {
   const [open, setOpen] = useState(false)
   const [modalNoticeNo, setModalNoticeNo] = useState('')
 
+  useEffect(() => {
+    if (isObjectNotEmpty(sessionState)) {
+      if (sessionState?.pwdInitYn !== 'Y') {
+        setChangePasswordPopOpen(true)
+      } else {
+        // pwdInitYn이 'Y'라면 팝업을 닫음 (false)
+        setChangePasswordPopOpen(false)
+      }
+    }
+  }, [sessionState])
+
+  //if (!isSessionLoaded) return null
+
   return (
     <>
       {open && <BoardDetailModal noticeNo={modalNoticeNo} setOpen={setOpen} />}
-      {(!chagePasswordPopOpen && (
+      {changePasswordPopOpen ? (
+        <ChangePasswordPop setChangePasswordPopOpen={setChangePasswordPopOpen} />
+      ) : (
         <>
           <div className="background-bord"></div>
           <div className="main-contents">
@@ -131,11 +155,8 @@ export default function MainPage() {
             <MainContents setFaqOpen={setOpen} setFaqModalNoticeNo={setModalNoticeNo} />
           </div>
         </>
-      )) || (
-        <>
-          <ChangePasswordPop setChagePasswordPopOpen={setChagePasswordPopOpen} />
-        </>
       )}
+
     </>
   )
 }
diff --git a/src/components/main/ChangePasswordPop.jsx b/src/components/main/ChangePasswordPop.jsx
index 54075153..efae3bb5 100644
--- a/src/components/main/ChangePasswordPop.jsx
+++ b/src/components/main/ChangePasswordPop.jsx
@@ -114,7 +114,7 @@ export default function ChangePasswordPop(props) {
                 const result = { ...sessionState, pwdInitYn: 'Y' }
                 setSession(result)
                 setSessionState(result)
-                props.setChagePasswordPopOpen(false)
+                props.setChangePasswordPopOpen(false)
                 await login()
               },
             })