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 6ec3ba25..ee118601 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -262,12 +262,13 @@ export default function PassivityCircuitAllocation(props) {
         const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module' && obj.circuit?.circuitInfo?.id === selectedPcs.id)
         const circuitNumbers = circuitModules.map((obj) => {
           const circuitNumber = obj.circuitNumber.replace(/[()]/g, '').split('-')
-          return parseInt(circuitNumber[circuitNumber.length - 1])
+          return parseInt(circuitNumber[0])
         })
         const minCircuitNumber = Math.min(...circuitNumbers)
         canvas.remove(...circuitModules.map((module) => module.circuit))
         circuitModules.forEach((obj) => {
           obj.circuit = null
+          obj.circuitNumber = null
           obj.pcsItemId = null
         })
         setCircuitNumber(minCircuitNumber)
@@ -293,9 +294,11 @@ export default function PassivityCircuitAllocation(props) {
         canvas.remove(...circuitModules.map((module) => module.circuit))
         circuitModules.forEach((obj) => {
           obj.circuit = null
+          obj.circuitNumber = null
           obj.pcsItemId = null
         })
         canvas.renderAll()
+        setCircuitNumber(1)
         setTargetModules([])
         setModuleStatisticsData()
       },