diff --git a/src/main/java/capstone/checkIT/service/deviceService/DeviceServiceImpl.java b/src/main/java/capstone/checkIT/service/deviceService/DeviceServiceImpl.java
index c08aba4..25ac699 100644
--- a/src/main/java/capstone/checkIT/service/deviceService/DeviceServiceImpl.java
+++ b/src/main/java/capstone/checkIT/service/deviceService/DeviceServiceImpl.java
@@ -57,6 +57,10 @@ public List<DeviceResponseDTO> getDevicesByMemberId(Long memberId) {
         // 해당 멤버의 디바이스 조회
         List<Device> devices = deviceRepository.findByMemberId(memberId);
 
+        if (devices.isEmpty()) {
+            throw new GeneralException(ErrorStatus.DEVICE_NOT_FOUND);
+        }
+
         // 응답 DTO로 변환
         return devices.stream()
                 .map(device -> DeviceResponseDTO.builder()