diff --git a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
index 7cdef358..cda87230 100644
--- a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
+++ b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
@@ -212,7 +212,7 @@ export default function ModuleTabContents({ tabIndex, addRoof, setAddedRoofs, ro
                   type="checkbox"
                   id={`ch01_${tabIndex}`}
                   disabled={cvrYn === 'N' ? true : false}
-                  checked={cvrChecked || false}
+                  checked={cvrYn === 'N' ? false : cvrChecked ?? true}
                   onChange={handleCvrChecked}
                 />
                 <label htmlFor={`ch01_${tabIndex}`}>{getMessage('modal.module.basic.setting.module.eaves.bar.fitting')}</label>
diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx
index 19169e4f..e208a286 100644
--- a/src/components/floor-plan/modal/basic/step/Trestle.jsx
+++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx
@@ -859,7 +859,7 @@ const Trestle = forwardRef((props, ref) => {
                     type="checkbox"
                     id={`ch01`}
                     disabled={!cvrYn || cvrYn === 'N'}
-                    checked={cvrChecked ?? false}
+                    checked={!cvrYn || cvrYn === 'N' ? false : cvrChecked ?? true}
                     // onChange={() => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, cvrChecked: !trestleState.cvrChecked } })}
                     onChange={() => setCvrChecked(!cvrChecked)}
                   />