diff --git a/src/main/java/com/ohdab/classroom/service/AddWorkbookService.java b/src/main/java/com/ohdab/classroom/service/AddWorkbookService.java
index c9369de..17a6d17 100644
--- a/src/main/java/com/ohdab/classroom/service/AddWorkbookService.java
+++ b/src/main/java/com/ohdab/classroom/service/AddWorkbookService.java
@@ -15,6 +15,7 @@
 import com.ohdab.workbook.domain.workbookid.WorkbookId;
 import com.ohdab.workbook.repository.WorkbookRepository;
 import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,14 +60,15 @@ private Workbook saveWorkbook(
 
     private void saveMistakeNote(long classroomId, WorkbookId workbookId) {
         List<StudentId> studentIdList = classroomRepository.findStudentsById(classroomId);
-        studentIdList.forEach(
-                studentId -> {
-                    MistakeNote mistakeNote =
-                            MistakeNote.builder()
-                                    .studentId(studentId)
-                                    .workbookId(workbookId)
-                                    .build();
-                    mistakeNoteRepository.save(mistakeNote);
-                });
+        List<MistakeNote> mistakeNoteList =
+                studentIdList.stream()
+                        .map(
+                                studentId ->
+                                        MistakeNote.builder()
+                                                .studentId(studentId)
+                                                .workbookId(workbookId)
+                                                .build())
+                        .collect(Collectors.toList());
+        mistakeNoteRepository.saveAll(mistakeNoteList);
     }
 }
diff --git a/src/test/java/com/ohdab/classroom/service/AddWorkbookServiceTest.java b/src/test/java/com/ohdab/classroom/service/AddWorkbookServiceTest.java
index c5422aa..7f30c4f 100644
--- a/src/test/java/com/ohdab/classroom/service/AddWorkbookServiceTest.java
+++ b/src/test/java/com/ohdab/classroom/service/AddWorkbookServiceTest.java
@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.ohdab.classroom.domain.Classroom;
 import com.ohdab.classroom.domain.classroomInfo.ClassroomInfo;
@@ -81,6 +83,6 @@ public class AddWorkbookServiceTest {
                                 addWorkbookUsecase.addWorkbookByClassroomId(
                                         classroomId, addWorkbookDto));
         assertThat(classroom.getWorkbooks().size()).isEqualTo(workbookId);
-        Mockito.verify(mistakeNoteRepository, times(studentIdList.size())).save(Mockito.any());
+        Mockito.verify(mistakeNoteRepository).saveAll(Mockito.any());
     }
 }