diff --git a/src/upf/metrics.c b/src/upf/metrics.c
index 0d1d277ab..5f280404f 100644
--- a/src/upf/metrics.c
+++ b/src/upf/metrics.c
@@ -286,7 +286,7 @@ void upf_metrics_inst_by_dnn_add(char *dnn,
     ogs_assert(dnn_key);
 
     if (dnn) {
-        strcpy(dnn_key->dnn, dnn);
+        ogs_cpystrn(dnn_key->dnn, dnn, ogs_min(strlen(dnn), OGS_MAX_DNN_LEN)+1);
     } else {
         dnn_key->dnn[0] = '\0';
     }
diff --git a/src/upf/n4-handler.c b/src/upf/n4-handler.c
index 378a0bd73..212179e94 100644
--- a/src/upf/n4-handler.c
+++ b/src/upf/n4-handler.c
@@ -436,7 +436,6 @@ void upf_n4_handle_session_deletion_request(
             upf_metrics_inst_by_dnn_add(sess->apn_dnn,
                     UPF_METR_GAUGE_UPF_QOSFLOWS, -1);
         }
-        break;
     }
     upf_sess_remove(sess);
 }