diff --git a/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java b/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
index a890dfa3a2..9f82c4fc57 100644
--- a/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
+++ b/spring-boot-data/src/main/java/com/baeldung/jsonexception/ErrorHandler.java
@@ -1,13 +1,11 @@
 package com.baeldung.jsonexception;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@ControllerAdvice
-@ResponseBody
+@RestControllerAdvice
 public class ErrorHandler {
 
     @ExceptionHandler(CustomException.class)