diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index 34595c99..9ae90e71 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -48,12 +48,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState)
   const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 })
   const [checkedModules, setCheckedModules] = useRecoilState(checkedModuleState)
-  const [manualSetupMode, setManualSetupMode] = useRecoilState(toggleManualSetupModeState)
-  const [layoutSetup, setLayoutSetup] = useState([{}])
-  const [isManualModuleSetup, setIsManualModuleSetup] = useRecoilState(isManualModuleSetupState)
-  const [isManualModuleLayoutSetup, setIsManualModuleLayoutSetup] = useRecoilState(isManualModuleLayoutSetupState)
-
-  const [roofs, setRoofs] = useState(null)
+  const [roofs, setRoofs] = useState(addedRoofs)
   const {
     moduleSelectionInitParams,
     selectedModules,
diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx
index a6c62750..dd5a7529 100644
--- a/src/components/floor-plan/modal/basic/step/Trestle.jsx
+++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx
@@ -258,9 +258,19 @@ const Trestle = forwardRef((props, ref) => {
       setRoofs(newAddedRoofs)
       setModuleSelectionData({
         ...moduleSelectionData,
-        roofConstruction: {
-          ...newAddedRoofs,
-        },
+        roofConstructions: newAddedRoofs.map((roof) => {
+          return {
+            addRoof: {
+              ...roof.addRoof,
+            },
+            trestle: {
+              ...roof.trestle,
+            },
+            construction: {
+              ...roof.construction,
+            },
+          }
+        }),
       })
       trestleTrigger({
         roofConstruction: newAddedRoofs.map((roof) => {