diff --git a/src/smf/context.c b/src/smf/context.c
index 69f59f3b1..a61679626 100644
--- a/src/smf/context.c
+++ b/src/smf/context.c
@@ -1682,6 +1682,7 @@ void smf_sess_remove(smf_sess_t *sess)
     ogs_fsm_fini(&sess->sm, &e);
 
     OGS_TLV_CLEAR_DATA(&sess->gtp.ue_pco);
+    OGS_TLV_CLEAR_DATA(&sess->gtp.ue_apco);
     OGS_TLV_CLEAR_DATA(&sess->gtp.ue_epco);
     OGS_TLV_CLEAR_DATA(&sess->gtp.user_location_information);
     OGS_TLV_CLEAR_DATA(&sess->gtp.ue_timezone);
diff --git a/tests/non3gpp/s2b-handler.c b/tests/non3gpp/s2b-handler.c
index 92c00f5b2..0c91e3851 100644
--- a/tests/non3gpp/s2b-handler.c
+++ b/tests/non3gpp/s2b-handler.c
@@ -45,6 +45,8 @@ void test_s2b_handle_create_session_response(
 
         cause_value = cause->value;
         if (cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        } else if (cause_value ==
+                OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE) {
         } else {
             ogs_error("GTP Failed [CAUSE:%d]", cause_value);
             return;