diff --git a/lib/sbi/message.c b/lib/sbi/message.c
index df117025e..73a8a180c 100644
--- a/lib/sbi/message.c
+++ b/lib/sbi/message.c
@@ -2072,23 +2072,19 @@ static int on_header_value(
     ogs_assert(data);
 
     if (data->num_of_part < OGS_SBI_MAX_NUM_OF_PART && at && length) {
-        SWITCH(data->header_field)
-        CASE(OGS_SBI_CONTENT_TYPE)
+        if (!ogs_strcasecmp(data->header_field, OGS_SBI_CONTENT_TYPE)) {
             ogs_assert(data->part[data->num_of_part].content_type == NULL);
             data->part[data->num_of_part].content_type =
                 ogs_strndup(at, length);
             ogs_assert(data->part[data->num_of_part].content_type);
-            break;
-        CASE(OGS_SBI_CONTENT_ID)
+        } else if (!ogs_strcasecmp(data->header_field, OGS_SBI_CONTENT_ID)) {
             ogs_assert(data->part[data->num_of_part].content_id == NULL);
             data->part[data->num_of_part].content_id =
                 ogs_strndup(at, length);
             ogs_assert(data->part[data->num_of_part].content_id);
-            break;
-
-        DEFAULT
+        } else {
             ogs_error("Unknown header field [%s]", data->header_field);
-        END
+        }
     }
 
     return 0;