diff --git a/open-banking-accelerator/internal-apis/internal-webapps/com.wso2.openbanking.accelerator.event.notifications.endpoint/src/main/java/com/wso2/openbanking/accelerator/event/notifications/endpoint/util/EventSubscriptionUtils.java b/open-banking-accelerator/internal-apis/internal-webapps/com.wso2.openbanking.accelerator.event.notifications.endpoint/src/main/java/com/wso2/openbanking/accelerator/event/notifications/endpoint/util/EventSubscriptionUtils.java
index ec3792bd..e0dee0b5 100644
--- a/open-banking-accelerator/internal-apis/internal-webapps/com.wso2.openbanking.accelerator.event.notifications.endpoint/src/main/java/com/wso2/openbanking/accelerator/event/notifications/endpoint/util/EventSubscriptionUtils.java
+++ b/open-banking-accelerator/internal-apis/internal-webapps/com.wso2.openbanking.accelerator.event.notifications.endpoint/src/main/java/com/wso2/openbanking/accelerator/event/notifications/endpoint/util/EventSubscriptionUtils.java
@@ -29,7 +29,7 @@
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.http.HttpStatus;
+import org.springframework.http.HttpStatus;
 
 import java.io.IOException;
 
@@ -76,7 +76,7 @@ public static JSONObject getJSONObjectPayload(HttpServletRequest request) throws
      */
     public static Response mapEventSubscriptionServiceResponse(EventSubscriptionResponse eventSubscriptionResponse) {
         int status = eventSubscriptionResponse.getStatus();
-        if (HttpStatus.NO_CONTENT_204 == status) {
+        if (HttpStatus.NO_CONTENT.value() == status) {
             return Response.status(status)
                     .build();
         } else if (eventSubscriptionResponse.getErrorResponse() == null) {
@@ -85,7 +85,7 @@ public static Response mapEventSubscriptionServiceResponse(EventSubscriptionResp
                         .entity(eventSubscriptionResponse.getResponseBody())
                         .build();
             } else {
-                return Response.status(HttpStatus.INTERNAL_SERVER_ERROR_500)
+                return Response.status(HttpStatus.INTERNAL_SERVER_ERROR.value())
                         .entity(EventNotificationServiceUtil.getErrorDTO(EventNotificationConstants.INVALID_REQUEST,
                                 EventNotificationConstants.ERROR_HANDLING_EVENT_SUBSCRIPTION))
                         .build();