diff --git a/.DS_Store b/.DS_Store
index 0e8e313..917146a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/src/main/java/Capstone/AutoScheduler/global/service/GeneratorService/GeneratorQueryServiceImpl.java b/src/main/java/Capstone/AutoScheduler/global/service/GeneratorService/GeneratorQueryServiceImpl.java
index a433ddb..2763f9c 100644
--- a/src/main/java/Capstone/AutoScheduler/global/service/GeneratorService/GeneratorQueryServiceImpl.java
+++ b/src/main/java/Capstone/AutoScheduler/global/service/GeneratorService/GeneratorQueryServiceImpl.java
@@ -18,15 +18,21 @@
 @Getter
 public class GeneratorQueryServiceImpl implements GeneratorQueryService {
 
-        private final GeneratorRepository generatorRepository;
+    private final GeneratorRepository generatorRepository;
 
-        @Override
-        public Generator findById(Long generatorId) {
-            Generator generator = generatorRepository.findById(generatorId).get();
-            return generatorRepository.save(generator);
-        }
+//        @Override
+//        public Generator findById(Long generatorId) {
+//            Generator generator = generatorRepository.findById(generatorId).get();
+//            return generatorRepository.save(generator);
+//        }
+
+    @Override
+    public Generator findById(Long generatorId) {
+        return generatorRepository.findById(generatorId)
+                .orElseThrow(() -> new IllegalArgumentException("해당 Generator가 존재하지 않습니다. ID: " + generatorId));
+    }
 
-        @Override
+    @Override
         public List<Generator> getGenerators() {
             return generatorRepository.findAllByOrderByGeneratorIdDesc();
         }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8003380..de5496f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,3 +2,4 @@ spring.application.name=AutoScheduler
 spring.datasource.url=jdbc:postgresql://aws-0-ap-northeast-2.pooler.supabase.com:6543/postgres
 spring.datasource.username=postgres.plqdmgsctmlrqxuvqsor
 spring.datasource.password=capstoneteam04kimparksong
+spring.datasource.hikari.data-source-properties.prepareThreshold=0