diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin
index e64de59..d470b34 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.bin and b/.gradle/8.4/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock
index 5a12f30..dbb9ce7 100644
Binary files a/.gradle/8.4/executionHistory/executionHistory.lock and b/.gradle/8.4/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
index 3a3defa..f790185 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.bin and b/.gradle/8.4/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
index 479e6b6..d7c728e 100644
Binary files a/.gradle/8.4/fileHashes/fileHashes.lock and b/.gradle/8.4/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
index 460c017..61ae248 100644
Binary files a/.gradle/8.4/fileHashes/resourceHashesCache.bin and b/.gradle/8.4/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 481a6a3..f54ccb6 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ca1f30c..a5d8b50 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ad1aa387-a2b6-4ccb-a59e-292882510bfd" name="Changes" comment="commit">
-      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/cbe76c2d-bcf1-4ae0-b502-845cdf59804c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/cbe76c2d-bcf1-4ae0-b502-845cdf59804c.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/be/src/main/java/com/podmate/domain/pod/converter/PodConverter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/be/src/main/java/com/podmate/domain/pod/dto/PodResponseDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java" afterDir="false" />
-    </list>
+    <list default="true" id="ad1aa387-a2b6-4ccb-a59e-292882510bfd" name="Changes" comment="commit" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -252,7 +244,7 @@
       <workItem from="1748435823800" duration="7555000" />
       <workItem from="1748444369181" duration="118000" />
       <workItem from="1748617532422" duration="234000" />
-      <workItem from="1748622213121" duration="1696000" />
+      <workItem from="1748622213121" duration="3817000" />
     </task>
     <task id="LOCAL-00001" summary="commit">
       <option name="closed" value="true" />
diff --git a/be/src/main/java/com/podmate/domain/mypage/application/MyPageService.java b/be/src/main/java/com/podmate/domain/mypage/application/MyPageService.java
index 27acc11..e6e8545 100644
--- a/be/src/main/java/com/podmate/domain/mypage/application/MyPageService.java
+++ b/be/src/main/java/com/podmate/domain/mypage/application/MyPageService.java
@@ -49,6 +49,7 @@
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -265,18 +266,26 @@ public List<PodResponse> getInprogressJoinedPods(Long userId) {
         List<Pod> pods = getPodList(userId, POD_MEMBER, PodStatus.IN_PROGRESS);
         return pods.stream()
                 .map(pod -> {
-                    Delivery delivery = deliveryRepository.findByPod_Id(pod.getId())
-                            .orElseThrow(() -> new DeliveryNotFoundException());
-
-                    PodResponseDto.DeliveryDto deliveryDto = PodResponseDto.DeliveryDto.builder()
-                            .courierCompany(delivery.getCourierCompany())
-                            .trackingNum(delivery.getTrackingNum())
-                            .build();
-
-                    if (pod.getPodType() == PodType.MINIMUM) {
-                        return buildMinimumInprogressJoinedResponseDto(pod, deliveryDto);
-                    } else {
-                        return buildGroupBuyInprogressJoinedResponseDto(pod, deliveryDto);
+                    Optional<Delivery> deliveryOpt = deliveryRepository.findByPod_Id(pod.getId());
+
+                    if(deliveryOpt.isPresent()) {
+                        PodResponseDto.DeliveryDto deliveryDto = PodResponseDto.DeliveryDto.builder()
+                                .courierCompany(deliveryOpt.get().getCourierCompany())
+                                .trackingNum(deliveryOpt.get().getTrackingNum())
+                                .build();
+
+                        if (pod.getPodType() == PodType.MINIMUM) {
+                            return buildMinimumInprogressJoinedResponseDto(pod, deliveryDto);
+                        } else {
+                            return buildGroupBuyInprogressJoinedResponseDto(pod, deliveryDto);
+                        }
+                    }
+                    else{
+                        if (pod.getPodType() == PodType.MINIMUM) {
+                            return buildMinimumStatusResponseDto(pod);
+                        } else {
+                            return buildGroupBuyStatusResponseDto(pod);
+                        }
                     }
                 })
                 .collect(Collectors.toList());
diff --git a/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java b/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java
index 0db8e01..f15f954 100644
--- a/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java
+++ b/be/src/main/java/com/podmate/global/util/oauth2/OAuth2LoginSuccessHandler.java
@@ -90,7 +90,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
                         "refreshToken", refreshToken
                 )
         );
-        //response.getWriter().write(body);
+        //gresponse.getWriter().write(body);
 			String redirectUrl = UriComponentsBuilder
         .fromUriString("http://localhost:5173/oauth/redirect") // ✅ 프론트 리디렉션 주소
         .queryParam("status", "success")