diff --git a/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java b/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
index 5775a149fa8326d3a55079359115960d9dbc69aa..9fbeba63d0470903945ec63886eb2e9b71578156 100644
--- a/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
+++ b/src/main/java/org/nrg/xapi/rest/XapiRestControllerAdvice.java
@@ -40,7 +40,7 @@ public class XapiRestControllerAdvice {
 
     @ExceptionHandler(NrgServiceException.class)
     public ModelAndView handleNrgServiceException(final HttpServletRequest request, final NrgServiceException exception) {
-        return handleException(HttpStatus.CONFLICT, request, "An NRG service error occurred.", exception);
+        return handleException(HttpStatus.INTERNAL_SERVER_ERROR, request, "An NRG service error occurred.", exception);
     }
 
     @ExceptionHandler(URISyntaxException.class)