diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h
index ed93cdaadf..76abc3783d 100644
--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
@@ -474,7 +474,7 @@ typedef struct {
   // Cell type
   uint8_t type;
   // Time UE Stayed in Cell
-  long time_in_cell;
+  uint16_t time_in_cell;
   // Cause
   ngap_cause_t *cause;
 } last_visited_ngran_cell_info_t;
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 5c212438e1..65991f714d 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -1649,7 +1649,7 @@ void rrc_gNB_send_NGAP_HANDOVER_REQUIRED(gNB_RRC_INST *rrc,
   msg.source2target->ue_history_info.cause->type = NGAP_CAUSE_RADIO_NETWORK;
   msg.source2target->ue_history_info.cause->value = NGAP_CAUSE_RADIO_NETWORK_HANDOVER_DESIRABLE_FOR_RADIO_REASON;
   msg.source2target->ue_history_info.type = NGAP_CellSize_small;
-  msg.source2target->ue_history_info.time_in_cell = 500; // dummy number for now
+  msg.source2target->ue_history_info.time_in_cell = min(time(NULL) - UE->last_seen, 4095);
   msg.source2target->ue_history_info.id = target_cell;
 
   /* Fill both PDU Session Resource List IE (M) in Handover Required