diff --git a/lib/src/phy/fec/ldpc/ldpc_rm.c b/lib/src/phy/fec/ldpc/ldpc_rm.c
index a52b80806..46fd7f1af 100644
--- a/lib/src/phy/fec/ldpc/ldpc_rm.c
+++ b/lib/src/phy/fec/ldpc/ldpc_rm.c
@@ -687,5 +687,5 @@ int srsran_ldpc_rm_rx_c(srsran_ldpc_rm_t*        q,
   }
 
   // Return the number of useful LLR
-  return (int)((q->k0 + q->E) % q->Ncb);
+  return (int)SRSRAN_MIN(q->k0 + q->E, q->Ncb);
 }
diff --git a/lib/src/phy/fec/ldpc/test/ldpc_rm_chain_test.c b/lib/src/phy/fec/ldpc/test/ldpc_rm_chain_test.c
index 5047a5fc2..f94c5239c 100644
--- a/lib/src/phy/fec/ldpc/test/ldpc_rm_chain_test.c
+++ b/lib/src/phy/fec/ldpc/test/ldpc_rm_chain_test.c
@@ -546,7 +546,7 @@ int main(int argc, char** argv)
                               lift_size,
                               rv,
                               mod_type,
-                              Nref)) {
+                              Nref) < 0) {
         exit(-1);
       }
     }