diff --git a/build.gradle b/build.gradle
index f770dfeb0..1e44d745a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -338,7 +338,7 @@ dependencies {
   implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.10'
   implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
 
-  implementation group: 'com.github.hmcts', name: 'sscs-common', version: '4.23.0'
+  implementation group: 'com.github.hmcts', name: 'sscs-common', version: '4.24.0'
 
   implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
 
@@ -420,6 +420,29 @@ dependencyManagement {
     dependencySet(group: 'org.yaml', version: '1.33') {
       entry 'snakeyaml'
     }
+
+    // CVE-2022-41881, CVE-2022-41915
+    dependencySet(group: 'io.netty', version: '4.1.86.Final') {
+      entry 'netty-buffer'
+      entry 'netty-common'
+      entry 'netty-codec'
+      entry 'netty-codec-http'
+      entry 'netty-codec-http2'
+      entry 'netty-codec-socks'
+      entry 'netty-codec-dns'
+      entry 'netty-handler'
+      entry 'netty-handler-proxy'
+      entry 'netty-resolver'
+      entry 'netty-resolver-dns'
+      entry 'netty-resolver-dns-native-macos'
+      entry 'netty-resolver-dns-classes-macos'
+      entry 'netty-transport'
+      entry 'netty-transport-native-epoll'
+      entry 'netty-transport-native-kqueue'
+      entry 'netty-transport-native-unix-common'
+      entry 'netty-transport-classes-kqueue'
+      entry 'netty-transport-classes-epoll'
+    }
   }
 }
 
diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageService.java b/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageService.java
index 22caa7a2f..13b9697d0 100644
--- a/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageService.java
+++ b/src/main/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageService.java
@@ -70,7 +70,7 @@ public void processEventMessage(HmcMessage hmcMessage)
 
         DwpState resolvedState = hearingUpdateService.resolveDwpState(hmcStatus);
         if (resolvedState != null) {
-            caseData.setDwpState(resolvedState.getId());
+            caseData.setDwpState(resolvedState);
         }
         if (isHearingUpdated(hmcStatus, hearingResponse)) {
             hearingUpdateService.updateHearing(hearingResponse, caseData);
diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageServiceTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageServiceTest.java
index 095c53f35..ad99857bd 100644
--- a/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageServiceTest.java
+++ b/src/test/java/uk/gov/hmcts/reform/sscs/service/hmc/topic/ProcessHmcMessageServiceTest.java
@@ -172,7 +172,7 @@ void testReturnedStatusShouldUpdateDwpStateForCaseData() throws Exception {
         processHmcMessageService.processEventMessage(hmcMessage);
 
         // then
-        assertThat(sscsCaseDetails.getData().getDwpState()).isEqualTo(DwpState.HEARING_DATE_ISSUED.getId());
+        assertThat(sscsCaseDetails.getData().getDwpState()).isEqualTo(DwpState.HEARING_DATE_ISSUED);
     }
 
     @Test