diff --git a/src/hooks/module/useModule.js b/src/hooks/module/useModule.js
index f3fc0348..50e8e091 100644
--- a/src/hooks/module/useModule.js
+++ b/src/hooks/module/useModule.js
@@ -536,14 +536,7 @@ export function useModule() {
 
   const moduleRowRemove = (type) => {
     const activeModule = canvas.getObjects().filter((obj) => canvas.getActiveObjects()[0].id === obj.id)[0]
-    if (activeModule.circuit) {
-      swalFire({
-        title: getMessage('can.not.remove.module'),
-        icon: 'error',
-        type: 'alert',
-      })
-      return
-    }
+    c
     const rowModules = getRowModules(activeModule)
     const otherModules = getOtherModules(rowModules)
     const objects = getObjects()
@@ -671,6 +664,9 @@ export function useModule() {
     const moduleSetupSurface = canvas
       .getObjects()
       .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE && obj.id === activeModule.surfaceId)[0]
+    if (moduleSetupSurface.modules.filter((module) => module.circuit).length > 0) {
+      return
+    }
     let width = -1
     let isWarning = false
     if (targetModules.length === 0) {
@@ -776,6 +772,9 @@ export function useModule() {
     const moduleSetupSurface = canvas
       .getObjects()
       .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE && obj.id === activeModule.surfaceId)[0]
+    if (moduleSetupSurface.modules.filter((module) => module.circuit).length > 0) {
+      return
+    }
     let height = -1
     let isWarning = false
     canvas.discardActiveObject()
@@ -855,6 +854,14 @@ export function useModule() {
   }
 
   const alignModule = (type, surfaceArray) => {
+    if (activeModule.circuit) {
+      swalFire({
+        title: getMessage('can.not.remove.module'),
+        icon: 'error',
+        type: 'alert',
+      })
+      return
+    }
     surfaceArray.forEach((surface) => {
       const modules = surface.modules
 
@@ -939,6 +946,7 @@ export function useModule() {
         .getObjects()
         .filter((module) => module.name === POLYGON_TYPE.MODULE && module.surfaceId === surface.id)
         .forEach((module) => {
+          canvas.remove(module.circuit)
           canvas.remove(module)
         })
     })