diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt
index 6843922..0379fe9 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/QcCategoryRepository.kt
@@ -31,6 +31,15 @@ interface QcCategoryRepository : AbstractRepository<QcCategory, Long> {
         """
     )
     fun findQcCategoryInfoByItemIdAndType(itemId: Long, type: String): QcCategoryInfo?;
-    fun findQcCategoryInfoByIsDefault(isDefault: Boolean): QcCategoryInfo?;
+
+    @Query(
+        """
+        SELECT qcc FROM QcCategory qcc
+        WHERE qcc.isDefault = :isDefault AND qcc.deleted = false
+        ORDER BY qcc.id ASC
+    """
+    )
+    fun findQcCategoryInfoByIsDefault(isDefault: Boolean): List<QcCategoryInfo>;
+
 //    fun findByItemIdAndType(itemId: Long, type: String): QcCategory?;
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt
index 55a14c5..2fc4197 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/QcCategoryService.kt
@@ -44,7 +44,8 @@ open class QcCategoryService(
             else null
             //
             if (result == null) {   // Use Default Template
-                result = qcCategoryRepository.findQcCategoryInfoByIsDefault(true)
+                val defaultTemplates = qcCategoryRepository.findQcCategoryInfoByIsDefault(true)
+                result = defaultTemplates.firstOrNull()
             }
         }
         return result;