diff --git a/src/main/java/com/mirna/hospitalmanagementapi/infra/handlers/EntityNotFoundErrorHandler.java b/src/main/java/com/mirna/hospitalmanagementapi/infra/handlers/EntityNotFoundErrorHandler.java
new file mode 100644
index 0000000..c23e100
--- /dev/null
+++ b/src/main/java/com/mirna/hospitalmanagementapi/infra/handlers/EntityNotFoundErrorHandler.java
@@ -0,0 +1,29 @@
+package com.mirna.hospitalmanagementapi.infra.handlers;
+
+import java.util.NoSuchElementException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import jakarta.persistence.EntityNotFoundException;
+
+/**
+ * This @RestControllerAdvice is used to handle entity not found error and return appropriate response message
+ * 
+ * @author Mirna Gama
+ * @version 1.0
+ */
+@RestControllerAdvice
+public class EntityNotFoundErrorHandler {
+
+	@Autowired
+	private MessageSource messageSource;
+	
+	@ExceptionHandler({EntityNotFoundException.class}) 
+	public ResponseEntity<Object> handle(EntityNotFoundException expection) {
+		return ResponseEntity.notFound().build();
+	}
+}