diff --git a/src/pages/MyCombinationPage/MyCombinationPage.jsx b/src/pages/MyCombinationPage/MyCombinationPage.jsx
index ffc4ac59e959d939fd0f82fbb1501e62aaf120ea..c3633e4345996ee94960dfe421a7047135f3fa8d 100644
--- a/src/pages/MyCombinationPage/MyCombinationPage.jsx
+++ b/src/pages/MyCombinationPage/MyCombinationPage.jsx
@@ -86,9 +86,15 @@ const CertifiedCombination = () => {
   const handleDeletePC = async (pcId) => {
     try {
       await deletePC(pcId);
-      setPcs(pcs.filter(pc => pc.id !== pcId));
+      const updatedPcs = pcs.filter(pc => pc.id !== pcId);
+      setPcs(updatedPcs);
+      
       if (selectedPc?.id === pcId) {
-        setSelectedPc(pcs.find(pc => pc.id !== pcId) || null);
+        const nextPc = updatedPcs[0] || null;
+        setSelectedPc(nextPc);
+        if (!nextPc) {
+          setPartsData([]);
+        }
       }
     } catch (error) {
       console.error("PC 삭제 중 오류 발생:", error);
diff --git a/src/pages/PartsCertification/Waiting.jsx b/src/pages/PartsCertification/Waiting.jsx
index 33b9364dfc51673146a24f2b24fedc19725151eb..72ef0abab059ac7b6534bb30f701552b13293fbf 100644
--- a/src/pages/PartsCertification/Waiting.jsx
+++ b/src/pages/PartsCertification/Waiting.jsx
@@ -16,7 +16,7 @@ const Waiting = () => {
           setIsSuccess(true);
           setTimeout(() => {
             navigate('/mycombination');
-          }, 5000);
+          }, 3000);
         }
       } catch (error) {
         console.error('인증 상태 확인 중 오류 발생:', error);