diff --git a/openair2/RRC/LITE/defs.h b/openair2/RRC/LITE/defs.h
index 8c1ed7c215c8f2aa28c15a1a347edbd8778ed99c..0a661849988efbea794cc129772db7074a56fb01 100644
--- a/openair2/RRC/LITE/defs.h
+++ b/openair2/RRC/LITE/defs.h
@@ -451,14 +451,12 @@ typedef struct eNB_RRC_UE_s {
   uint32_t                           ul_failure_timer;
   uint32_t                           ue_release_timer;
   uint32_t                           ue_release_timer_thres;
-#ifdef UE_EXPANSION
   uint32_t                           ue_release_timer_s1;
   uint32_t                           ue_release_timer_thres_s1;
   uint32_t                           ue_release_timer_rrc;
   uint32_t                           ue_release_timer_thres_rrc;
   uint32_t                           ue_reestablishment_timer;
   uint32_t                           ue_reestablishment_timer_thres;
-#endif
   uint8_t                            e_rab_release_command_flag;
 } eNB_RRC_UE_t;
 
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 1a31d3d700c8c697e8080ce551a02fac8175e9ab..ecf6eed912b4e1c7369b1e0ab0756b1b8405e291 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1196,7 +1196,7 @@ rrc_eNB_generate_RRCConnectionReestablishment(
   ue_context_pP->ue_context.ue_reestablishment_timer_thres = 1000;
 #else
   // activate release timer, if RRCComplete not received after 10 frames, remove UE
-  //ue_context_pP->ue_context.ue_release_timer = 1;
+  ue_context_pP->ue_context.ue_release_timer = 1;
   // remove UE after 10 frames after RRCConnectionReestablishmentRelease is triggered
   ue_context_pP->ue_context.ue_release_timer_thres = 100;
 #endif
@@ -1894,7 +1894,7 @@ rrc_eNB_generate_RRCConnectionRelease(
   ue_context_pP->ue_context.ue_release_timer_s1 = 0;
 #else
   // set release timer
-  //ue_context_pP->ue_context.ue_release_timer=1;
+  ue_context_pP->ue_context.ue_release_timer=1;
   // remove UE after 10 frames after RRCConnectionRelease is triggered
   ue_context_pP->ue_context.ue_release_timer_thres=100;
 #endif
@@ -5142,7 +5142,7 @@ rrc_eNB_generate_RRCConnectionSetup(
    ue_context_pP->ue_context.ue_release_timer_thres=1000;
 #else
   // activate release timer, if RRCSetupComplete not received after 10 frames, remove UE
-  //ue_context_pP->ue_context.ue_release_timer=1;
+  ue_context_pP->ue_context.ue_release_timer=1;
   // remove UE after 10 frames after RRCConnectionRelease is triggered
   ue_context_pP->ue_context.ue_release_timer_thres=100;
 #endif