diff --git a/hw/dv/sv/csrng_agent/csrng_item.sv b/hw/dv/sv/csrng_agent/csrng_item.sv
index 488fb2694e7d9..02f3bdedd3d53 100644
--- a/hw/dv/sv/csrng_agent/csrng_item.sv
+++ b/hw/dv/sv/csrng_agent/csrng_item.sv
@@ -33,7 +33,7 @@ class csrng_item extends uvm_sequence_item;
 
   constraint c_glen {
     glen dist {
-      // TODO(#18350): Add a bin for 0 (with 5% chance, like for 4095?).
+      // Note that 0 isn't supported by the implementation, see #23846.
       [1:32]      :/ 75,
       [33:128]    :/ 10,
       [129:1024]  :/ 5,
diff --git a/hw/ip/csrng/doc/theory_of_operation.md b/hw/ip/csrng/doc/theory_of_operation.md
index 5abadc8540e68..89b774f9f39d4 100644
--- a/hw/ip/csrng/doc/theory_of_operation.md
+++ b/hw/ip/csrng/doc/theory_of_operation.md
@@ -183,7 +183,7 @@ Below is a description of the fields of this header:
          Each unit represents 128 bits of entropy returned.
          This field allows values between 1 and 4095.
          A value of 1 returns 1 * 128 bits of entropy.
-         A value of 4095 returns 4095 * 128 bits of entropy, which is less than the 2<sup>19</sup> bits allowed by NIST (referenced to as <tt>max_number_of_bit_per_request</tt>).
+         A value of 4095 returns 4095 * 128 bits of entropy, which is less than the 2<sup>19</sup> bits allowed by NIST (referenced to as <tt>max_number_of_bits_per_request</tt>).
     </td>
   </tr>
   <tr>
diff --git a/hw/ip/csrng/dv/cov/csrng_cov_if.sv b/hw/ip/csrng/dv/cov/csrng_cov_if.sv
index 9cb74d87748e0..6e0c2552938b7 100644
--- a/hw/ip/csrng/dv/cov/csrng_cov_if.sv
+++ b/hw/ip/csrng/dv/cov/csrng_cov_if.sv
@@ -326,9 +326,12 @@ interface csrng_cov_if (
     }
 
     cp_glen: coverpoint glen {
-      bins one         = { 1 };
-      bins multiple    = { [2:$] };
-      ignore_bins zero = { 0 };
+      bins one = { 1 };
+      bins sml = { [2:32] };
+      bins med = { [33:128] };
+      bins lrg = { [129:1024] };
+      bins xtr = { [1025:4094] };
+      bins max = { 4095 };
     }
 
     // Coverpoint for all of the possible transitions of flag0 that can cause a