diff --git a/lib/include/srslte/upper/rlc_common.h b/lib/include/srslte/upper/rlc_common.h
index bfc21f711..a5b2e0403 100644
--- a/lib/include/srslte/upper/rlc_common.h
+++ b/lib/include/srslte/upper/rlc_common.h
@@ -151,6 +151,10 @@ struct rlc_status_pdu_t{
 class rlc_common
 {
 public:
+
+  // Size of the Uplink buffer in number of PDUs
+  const static int RLC_BUFFER_NOF_PDU = 128;
+
   virtual ~rlc_common() {}
   virtual void init(srslte::log                       *rlc_entity_log_,
                     uint32_t                           lcid_,
diff --git a/lib/src/upper/rlc_entity.cc b/lib/src/upper/rlc_entity.cc
index 762f853d6..4d0573043 100644
--- a/lib/src/upper/rlc_entity.cc
+++ b/lib/src/upper/rlc_entity.cc
@@ -43,7 +43,7 @@ void rlc_entity::init(rlc_mode_t                   mode_,
 {
 
   if (buffer_size <= 0) {
-    buffer_size = 64;
+    buffer_size = rlc_common::RLC_BUFFER_NOF_PDU;
   }
   // Create the RLC instance the first time init() is called.
   // If called to reestablished, the entity is stopped but not destroyed