diff --git a/src/main/java/com/indexzero/finals/controller/EntranceController.java b/src/main/java/com/indexzero/finals/controller/EntranceController.java
index 004da8a..790e4e2 100644
--- a/src/main/java/com/indexzero/finals/controller/EntranceController.java
+++ b/src/main/java/com/indexzero/finals/controller/EntranceController.java
@@ -35,6 +35,7 @@ public class EntranceController {
     @Operation(description = "Get user's last entries. Username is taken from Authentication", summary = "Get user's last entry")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "Request Successful."),
+            @ApiResponse(responseCode = "204", description = "No Entrances."),
             @ApiResponse(responseCode = "401", description = "Unauthorized"),
     })
     public ResponseEntity<EntranceDTO> getLastEntrance() {
diff --git a/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java b/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java
index fc4f979..61f2b6c 100644
--- a/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java
+++ b/src/main/java/com/indexzero/finals/service/impl/EntranceServiceImpl.java
@@ -41,8 +41,12 @@ public class EntranceServiceImpl implements EntranceService {
     public ResponseEntity<EntranceDTO> getLastEntrance(Authentication auth) {
         Employee employee = employeeRepository.findByLogin(auth.getName());
         List<EntranceDTO> entrances = employee.getEntrances().stream().map(EntranceMapper::convertToDTO).toList();
-        System.out.println(entrances.getLast());
-        return new ResponseEntity<>(entrances.getLast(), HttpStatus.OK);
+        if(entrances.isEmpty()) {
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        }
+        else {
+            return new ResponseEntity<>(entrances.getLast(), HttpStatus.OK);
+        }
     }
 
     @Override