diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index 03045429..faf31eef 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -292,7 +292,7 @@ export default function PassivityCircuitAllocation(props) {
         }
         const circuitNumbers = circuitModules.map((obj) => {
           const circuitNumber = obj.circuitNumber.replace(/[()]/g, '').split('-')
-          return parseInt(circuitNumber[0])
+          return parseInt(circuitNumber[circuitNumber.length - 1])
         })
         const minCircuitNumber = Math.min(...circuitNumbers)
         canvas.remove(...circuitModules.map((module) => module.circuit))
@@ -526,8 +526,8 @@ export default function PassivityCircuitAllocation(props) {
                         {header.map((header, i) => (
                           <td className="al-c" key={'rowcell' + i}>
                             {typeof row[header.prop] === 'number'
-                              ? row[header.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 })
-                              : row[header.prop]}
+                              ? (row[header.prop] ?? 0).toLocaleString('ko-KR', { maximumFractionDigits: 4 })
+                              : (row[header.prop] ?? 0)}
                           </td>
                         ))}
                       </tr>