diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index b92150e65b..6a5c9f691f 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -249,6 +249,8 @@ typedef enum {
 } rrc_action_t;
 
 typedef struct gNB_RRC_UE_s {
+  time_t last_seen; // last time this UE has been accessed
+
   drb_t                              established_drbs[MAX_DRBS_PER_UE];
   NR_DRB_ToReleaseList_t            *DRB_ReleaseList;
 
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 3b73bae843..d26ece970c 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <time.h>
 
 #include "nr_rrc_config.h"
 #include "nr_rrc_defs.h"
@@ -2290,6 +2291,7 @@ static void write_rrc_stats(const gNB_RRC_INST *rrc)
     return;
   }
 
+  time_t now = time(NULL);
   int i = 0;
   rrc_gNB_ue_context_t *ue_context_p = NULL;
   /* cast is necessary to eliminate warning "discards ‘const’ qualifier" */
@@ -2309,6 +2311,8 @@ static void write_rrc_stats(const gNB_RRC_INST *rrc)
       fprintf(f, " S-TMSI %x", ue_ctxt->Initialue_identity_5g_s_TMSI.fiveg_tmsi);
     fprintf(f, ":\n");
 
+    time_t last_seen = now - ue_ctxt->last_seen;
+    fprintf(f, "    last RRC activity: %ld seconds ago\n", last_seen);
     fprintf(f, "    RRC status %s\n", get_rrc_connection_status_text(ue_ctxt->StatusRrc));
 
     if (ue_ctxt->nb_of_pdusessions == 0)
diff --git a/openair2/RRC/NR/rrc_gNB_UE_context.c b/openair2/RRC/NR/rrc_gNB_UE_context.c
index c560753807..18edf9e856 100644
--- a/openair2/RRC/NR/rrc_gNB_UE_context.c
+++ b/openair2/RRC/NR/rrc_gNB_UE_context.c
@@ -32,11 +32,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#include <time.h>
 
 #include "common/utils/LOG/log.h"
 #include "rrc_gNB_UE_context.h"
 #include "openair2/F1AP/f1ap_ids.h"
 
+static void rrc_gNB_ue_context_update_time(rrc_gNB_ue_context_t *ctxt)
+{
+  ctxt->ue_context.last_seen = time(NULL);
+}
 
 //------------------------------------------------------------------------------
 int rrc_gNB_compare_ue_rnti_id(rrc_gNB_ue_context_t *c1_pP, rrc_gNB_ue_context_t *c2_pP)
@@ -68,6 +73,7 @@ rrc_gNB_ue_context_t *rrc_gNB_allocate_new_ue_context(gNB_RRC_INST *rrc_instance
     return NULL;
   }
   new_p->ue_context.rrc_ue_id = uid_linear_allocator_new(&rrc_instance_pP->uid_allocator) + 1;
+  rrc_gNB_ue_context_update_time(new_p);
 
   for(int i = 0; i < NB_RB_MAX; i++)
     new_p->ue_context.pduSession[i].xid = -1;
@@ -92,8 +98,10 @@ rrc_gNB_ue_context_t *rrc_gNB_get_ue_context_by_rnti(gNB_RRC_INST *rrc_instance_
   rrc_gNB_ue_context_t *ue_context_p;
   RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(rrc_instance_pP->rrc_ue_head)) {
     f1_ue_data_t ue_data = cu_get_f1_ue_data(ue_context_p->ue_context.rrc_ue_id);
-    if (ue_data.du_assoc_id == assoc_id && ue_context_p->ue_context.rnti == rntiP)
+    if (ue_data.du_assoc_id == assoc_id && ue_context_p->ue_context.rnti == rntiP) {
+      rrc_gNB_ue_context_update_time(ue_context_p);
       return ue_context_p;
+    }
   }
   LOG_W(NR_RRC, "search by RNTI %04x and assoc_id %d: no UE found\n", rntiP, assoc_id);
   return NULL;
@@ -104,8 +112,10 @@ rrc_gNB_ue_context_t *rrc_gNB_get_ue_context_by_rnti_any_du(gNB_RRC_INST *rrc_in
   rrc_gNB_ue_context_t *ue_context_p;
   RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(rrc_instance_pP->rrc_ue_head))
   {
-    if (ue_context_p->ue_context.rnti == rntiP)
+    if (ue_context_p->ue_context.rnti == rntiP) {
+      rrc_gNB_ue_context_update_time(ue_context_p);
       return ue_context_p;
+    }
   }
   LOG_W(NR_RRC, "search by rnti not found %04x\n", rntiP);
   return NULL;
@@ -146,8 +156,10 @@ rrc_gNB_ue_context_t *rrc_gNB_ue_context_random_exist(gNB_RRC_INST *rrc_instance
 {
   rrc_gNB_ue_context_t *ue_context_p = NULL;
   RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head) {
-    if (ue_context_p->ue_context.random_ue_identity == ue_identityP)
+    if (ue_context_p->ue_context.random_ue_identity == ue_identityP) {
+      rrc_gNB_ue_context_update_time(ue_context_p);
       return ue_context_p;
+    }
   }
   return NULL;
 }
@@ -161,8 +173,10 @@ rrc_gNB_ue_context_t *rrc_gNB_ue_context_5g_s_tmsi_exist(gNB_RRC_INST *rrc_insta
   RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head)
   {
     LOG_I(NR_RRC, "Checking for UE 5G S-TMSI %ld: RNTI %04x\n", s_TMSI, ue_context_p->ue_context.rnti);
-    if (ue_context_p->ue_context.ng_5G_S_TMSI_Part1 == s_TMSI)
+    if (ue_context_p->ue_context.ng_5G_S_TMSI_Part1 == s_TMSI) {
+      rrc_gNB_ue_context_update_time(ue_context_p);
       return ue_context_p;
+    }
   }
     return NULL;
 }