diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx
index 976e2cd1..96fbc6e4 100644
--- a/src/components/floor-plan/modal/basic/step/Orientation.jsx
+++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx
@@ -77,7 +77,7 @@ export const Orientation = forwardRef((props, ref) => {
   };
 
   useEffect(() => {
-    if (basicSetting.roofSizeSet == '3') {
+    if (basicSetting.roofSizeSet === '3') {
       restoreModuleInstArea()
     }
   }, [])
@@ -187,7 +187,7 @@ export const Orientation = forwardRef((props, ref) => {
           title: getMessage('module.not.found'),
           icon: 'warning',
         })
-        return
+
       }
     }
   }
@@ -250,8 +250,17 @@ export const Orientation = forwardRef((props, ref) => {
 
       // 필터링된 목록의 첫 번째 모듈을 자동 선택
       if (filtered.length > 0) {
-        setSelectedModules(filtered[0])
+        const firstModule = filtered[0]
+        setSelectedModules(firstModule)
+        // 상위 컴포넌트의 handleChangeModule 호출
+        if (handleChangeModule) {
+          handleChangeModule(firstModule)
+        }
       }
+    } else {
+      // 모듈 리스트가 비어있는 경우
+      setFilteredModuleList([])
+      setSelectedModules(null)
     }
   }
 
@@ -342,10 +351,14 @@ export const Orientation = forwardRef((props, ref) => {
             setSelectedModuleSeries(currentSeries)
           } else {
             setSelectedModuleSeries(allOption)
+            // "ALL"이 선택되면 자동으로 모듈 필터링 및 선택 실행
+            setTimeout(() => handleChangeModuleSeries(allOption), 0)
           }
         } else {
           // 선택된 모듈이 없으면 "전체"를 기본 선택
           setSelectedModuleSeries(allOption)
+          // "ALL"이 선택되면 자동으로 모듈 필터링 및 선택 실행
+          setTimeout(() => handleChangeModuleSeries(allOption), 0)
         }
       }
     }
@@ -369,6 +382,9 @@ export const Orientation = forwardRef((props, ref) => {
       if (filtered.length > 0 && !selectedModules) {
         setSelectedModules(filtered[0])
       }
+    } else if (moduleList.length === 0 && filteredModuleList.length === 0 && selectedModuleSeries) {
+      // 모듈 리스트가 비어있는 경우 빈 배열로 설정
+      setFilteredModuleList([])
     }
   }, [moduleList, selectedModuleSeries]);
   return (
@@ -462,6 +478,7 @@ export const Orientation = forwardRef((props, ref) => {
                         sourceKey={'itemId'}
                         showKey={'itemNm'}
                         onChange={(e) => handleChangeModule(e)}
+                        showFirstOptionWhenEmpty = {true}
                       />
                     )}
                   </div>
@@ -512,7 +529,7 @@ export const Orientation = forwardRef((props, ref) => {
                     </tbody>
                   </table>
                 </div>
-                {basicSetting && basicSetting.roofSizeSet == '3' && (
+                {basicSetting && basicSetting.roofSizeSet === '3' && (
                   <div className="outline-form mt15">
                     <span>{getMessage('modal.module.basic.setting.module.placement.area')}</span>
                     <div className="input-grid mr10" style={{ width: '60px' }}>
@@ -523,7 +540,7 @@ export const Orientation = forwardRef((props, ref) => {
                 )}
               </div>
 
-              {basicSetting && basicSetting.roofSizeSet != '3' && (
+              {basicSetting && basicSetting.roofSizeSet !== '3' && (
                 <div className="compas-table-box">
                   <div className="compas-grid-table">
                     <div className="outline-form">