diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 63daa318d5318ecd7deeff93cecff755770e9144..8fe104f84c680cd503ad91077c117d9c6500dbfb 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -3916,15 +3916,15 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
     buffer,
     PDCP_TRANSMISSION_MODE_CONTROL);
 
-  if (quantityConfig->quantityConfigEUTRA){
-    if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ){
-      free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
-    }
-    if (quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP){
-      free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
-    }
-    free(quantityConfig->quantityConfigEUTRA);
-  }
+  free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ);
+  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRQ = NULL;
+
+  free(quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP);
+  quantityConfig->quantityConfigEUTRA->filterCoefficientRSRP = NULL;
+
+  free(quantityConfig->quantityConfigEUTRA);
+  quantityConfig->quantityConfigEUTRA = NULL;
+
   free(quantityConfig);
   quantityConfig = NULL;