diff --git a/base/server/src/main/java/com/netscape/cmscore/dbs/Repository.java b/base/server/src/main/java/com/netscape/cmscore/dbs/Repository.java
index f299a90ed3c..ebc69eaced7 100644
--- a/base/server/src/main/java/com/netscape/cmscore/dbs/Repository.java
+++ b/base/server/src/main/java/com/netscape/cmscore/dbs/Repository.java
@@ -394,15 +394,17 @@ protected void checkRange() throws EBaseException
                 logger.debug("Reached the end of the range.  Attempting to move to next range");
                 if (!hasNextRange()) {
                     if (rangeLength == null || mCounter.compareTo(rangeLength) >= 0) {
+                        String latest = mRadix == HEX ? "0x" + mMaxSerialNo.toString(HEX) : mMaxSerialNo.toString();
                         throw new DBException(CMS.getUserMessage("CMS_DBS_LIMIT_REACHED",
-                                                                  mLastSerialNo.toString()));
+                                                                  latest));
                     }
                     return;
                 }
                 switchToNextRange();
             } else {
+                String latest = mRadix == HEX ? "0x" + mMaxSerialNo.toString(HEX) : mMaxSerialNo.toString();
                 throw new DBException(CMS.getUserMessage("CMS_DBS_LIMIT_REACHED",
-                        mLastSerialNo.toString()));
+                        latest));
             }
         }
     }
diff --git a/base/server/src/main/resources/UserMessages.properties b/base/server/src/main/resources/UserMessages.properties
index eada19c4834..3b445bebee7 100644
--- a/base/server/src/main/resources/UserMessages.properties
+++ b/base/server/src/main/resources/UserMessages.properties
@@ -455,7 +455,7 @@ CMS_DBS_LDAP_OP_FAILURE=LDAP operation failure - {0}
 CMS_DBS_NO_MAPPER_FOUND=No mapper found for {0}
 CMS_DBS_INTERNAL_DIR_ERROR=Internal Database Error encountered: {0}
 CMS_DBS_ADD_ENTRY_FAILED=Failed to add the schema entry: {0}
-CMS_DBS_LIMIT_REACHED=All serial numbers are used. The max serial number is 0x{0}
+CMS_DBS_LIMIT_REACHED=All serial numbers are used. The max serial number is {0}
 CMS_DBS_SETBACK_SERIAL=The serial number is already in use.\nYou can only set the serial number greater than 0x{0}
 CMS_DBS_SETBACK_MAXSERIAL=The serial number is already in use.\nYou can only set the end serial number greater than 0x{0}
 CMS_DBS_LDIF_FAILED=Failed to create ldif file: {0}