diff --git a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
index cda87230..9fd7da9a 100644
--- a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
+++ b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx
@@ -211,8 +211,8 @@ export default function ModuleTabContents({ tabIndex, addRoof, setAddedRoofs, ro
                 <input
                   type="checkbox"
                   id={`ch01_${tabIndex}`}
-                  disabled={cvrYn === 'N' ? true : false}
-                  checked={cvrYn === 'N' ? false : cvrChecked ?? true}
+                  disabled={cvrYn !== 'Y'}
+                  checked={cvrYn === 'Y' && (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/Placement.jsx b/src/components/floor-plan/modal/basic/step/Placement.jsx
index 091129a8..2dced068 100644
--- a/src/components/floor-plan/modal/basic/step/Placement.jsx
+++ b/src/components/floor-plan/modal/basic/step/Placement.jsx
@@ -194,7 +194,7 @@ const Placement = forwardRef((props, refs) => {
                               type="checkbox"
                               id={item.itemId}
                               name={item.itemId}
-                              checked={selectedItems[item.itemId]}
+                              checked={selectedItems[item.itemId] || false}
                               onChange={(e) => handleSelectedItem(e, item.itemId)}
                             />
                             <label htmlFor={item.itemId}></label>
@@ -217,8 +217,7 @@ const Placement = forwardRef((props, refs) => {
                               type="text"
                               className="input-origin block"
                               name="row"
-                              value={props.layoutSetup[index]?.row ?? 1}
-                              //defaultValue={0}
+                              value={props.layoutSetup[index]?.row || 1}
                               onChange={(e) => handleLayoutSetup(e, item.itemId, index)}
                             />
                           </div>
@@ -229,8 +228,7 @@ const Placement = forwardRef((props, refs) => {
                               type="text"
                               className="input-origin block"
                               name="col"
-                              value={props.layoutSetup[index]?.col ?? 1}
-                              //defaultValue={0}
+                              value={props.layoutSetup[index]?.col || 1}
                               onChange={(e) => handleLayoutSetup(e, item.itemId, index)}
                             />
                           </div>
@@ -268,7 +266,7 @@ const Placement = forwardRef((props, refs) => {
                             type="radio"
                             name="radio02"
                             id="ra03"
-                            checked={moduleSetupOption.isChidori}
+                            checked={moduleSetupOption.isChidori === true}
                             disabled={isChidoriNotAble}
                             value={'true'}
                             onChange={(e) => handleChangeChidori(e)}
@@ -280,7 +278,7 @@ const Placement = forwardRef((props, refs) => {
                             type="radio"
                             name="radio02"
                             id="ra04"
-                            checked={!moduleSetupOption.isChidori}
+                            checked={moduleSetupOption.isChidori === false}
                             value={'false'}
                             onChange={(e) => handleChangeChidori(e)}
                           />